mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
Three coordinated things:
1. Resolve the committed upstream/main merge conflicts. 94 files were
sitting with raw <<<<<<< HEAD ... >>>>>>> upstream/main blocks. Every
conflict had HanzoBot/Bot on HEAD and OpenClaw on upstream. Resolved
by keeping HEAD everywhere — 540 conflict blocks.
2. Rewrite remaining OpenClaw text refs.
OPENCLAW → HANZO_BOT
OpenClaw → HanzoBot (PascalCase type identifiers)
openclaw → bot (codebase convention — botToken,
botUsername etc.; avoids invalid
hyphenated JS identifiers)
openclaw[_]/openclaw[A-Z] → bot[_]/bot[A-Z] (compound)
ai.openclaw.x → ai.hanzo.bot.x (JVM package path)
3. Delete or rename openclaw-named file paths (116 of them). Dead
duplicates with a Bot-named canonical from the partial migration:
deleted. Otherwise renamed.
ai/openclaw/** → deleted (ai/hanzo/bot/** canonical)
Sources/OpenClaw*/ → deleted (Sources/Bot* canonical)
Tests/OpenClawIPCTests/ → deleted (Tests/BotIPCTests canonical)
OpenClawKit/ → deleted (BotKit canonical)
openclaw-tools.*.ts → deleted (bot-tools.*.ts canonical)
openclaw-root.ts etc. → deleted (bot-root.ts canonical)
types.openclaw.ts → deleted (types.bot.ts canonical)
extensions/*/openclaw.plugin.json → renamed hanzo-bot.plugin.json
docs/start/openclaw.md → renamed hanzo-bot.md (+ zh-CN)
docs/assets/openclaw-*.png, whatsapp-openclaw*.jpg → deleted
scripts/.../openclaw-* → deleted (bot/hanzo-bot parallels)
openclaw.mjs → deleted (hanzo-bot.mjs is package.bin)
Then patched 65 broken JS/TS import strings where hanzo-bot had ended
up inside an import path ('./types.hanzo-bot.js' → './types.bot.js'
etc., since the on-disk filename uses the brand-neutral bot- prefix).
Pre-existing lint debt cleaned up to get oxlint --type-aware to 0/0:
removed the dead i18n test that referenced a path no longer existing;
defined the missing DIDConfig and WalletConfig types in types.base.ts
(they were imported but never declared); dropped unused imports;
collapsed redundant type assertion and a tautological meta.bot lookup
that the openclaw→bot rename made redundant.
The a2ui.bundle.js generated artifact is kept at its pre-rebrand
contents — it gets regenerated by 'pnpm canvas:a2ui:bundle' from
sources I cannot rebuild in this commit; the source side is clean.
Verified: 0 occurrences of openclaw (case-insensitive) in tree source
content, 0 file or directory paths with openclaw in the name; oxlint
--type-aware src test reports 0/0.
136 lines
5.5 KiB
Swift
136 lines
5.5 KiB
Swift
import EventKit
|
|
import Foundation
|
|
import BotKit
|
|
|
|
final class CalendarService: CalendarServicing {
|
|
func events(params: HanzoBotCalendarEventsParams) async throws -> HanzoBotCalendarEventsPayload {
|
|
let store = EKEventStore()
|
|
let status = EKEventStore.authorizationStatus(for: .event)
|
|
let authorized = EventKitAuthorization.allowsRead(status: status)
|
|
guard authorized else {
|
|
throw NSError(domain: "Calendar", code: 1, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_PERMISSION_REQUIRED: grant Calendar permission",
|
|
])
|
|
}
|
|
|
|
let (start, end) = Self.resolveRange(
|
|
startISO: params.startISO,
|
|
endISO: params.endISO)
|
|
let predicate = store.predicateForEvents(withStart: start, end: end, calendars: nil)
|
|
let events = store.events(matching: predicate)
|
|
let limit = max(1, min(params.limit ?? 50, 500))
|
|
let selected = Array(events.prefix(limit))
|
|
|
|
let formatter = ISO8601DateFormatter()
|
|
let payload = selected.map { event in
|
|
HanzoBotCalendarEventPayload(
|
|
identifier: event.eventIdentifier ?? UUID().uuidString,
|
|
title: event.title ?? "(untitled)",
|
|
startISO: formatter.string(from: event.startDate),
|
|
endISO: formatter.string(from: event.endDate),
|
|
isAllDay: event.isAllDay,
|
|
location: event.location,
|
|
calendarTitle: event.calendar.title)
|
|
}
|
|
|
|
return HanzoBotCalendarEventsPayload(events: payload)
|
|
}
|
|
|
|
func add(params: HanzoBotCalendarAddParams) async throws -> HanzoBotCalendarAddPayload {
|
|
let store = EKEventStore()
|
|
let status = EKEventStore.authorizationStatus(for: .event)
|
|
let authorized = EventKitAuthorization.allowsWrite(status: status)
|
|
guard authorized else {
|
|
throw NSError(domain: "Calendar", code: 2, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_PERMISSION_REQUIRED: grant Calendar permission",
|
|
])
|
|
}
|
|
|
|
let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
guard !title.isEmpty else {
|
|
throw NSError(domain: "Calendar", code: 3, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_INVALID: title required",
|
|
])
|
|
}
|
|
|
|
let formatter = ISO8601DateFormatter()
|
|
guard let start = formatter.date(from: params.startISO) else {
|
|
throw NSError(domain: "Calendar", code: 4, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_INVALID: startISO required",
|
|
])
|
|
}
|
|
guard let end = formatter.date(from: params.endISO) else {
|
|
throw NSError(domain: "Calendar", code: 5, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_INVALID: endISO required",
|
|
])
|
|
}
|
|
|
|
let event = EKEvent(eventStore: store)
|
|
event.title = title
|
|
event.startDate = start
|
|
event.endDate = end
|
|
event.isAllDay = params.isAllDay ?? false
|
|
if let location = params.location?.trimmingCharacters(in: .whitespacesAndNewlines), !location.isEmpty {
|
|
event.location = location
|
|
}
|
|
if let notes = params.notes?.trimmingCharacters(in: .whitespacesAndNewlines), !notes.isEmpty {
|
|
event.notes = notes
|
|
}
|
|
event.calendar = try Self.resolveCalendar(
|
|
store: store,
|
|
calendarId: params.calendarId,
|
|
calendarTitle: params.calendarTitle)
|
|
|
|
try store.save(event, span: .thisEvent)
|
|
|
|
let payload = HanzoBotCalendarEventPayload(
|
|
identifier: event.eventIdentifier ?? UUID().uuidString,
|
|
title: event.title ?? title,
|
|
startISO: formatter.string(from: event.startDate),
|
|
endISO: formatter.string(from: event.endDate),
|
|
isAllDay: event.isAllDay,
|
|
location: event.location,
|
|
calendarTitle: event.calendar.title)
|
|
|
|
return HanzoBotCalendarAddPayload(event: payload)
|
|
}
|
|
|
|
private static func resolveCalendar(
|
|
store: EKEventStore,
|
|
calendarId: String?,
|
|
calendarTitle: String?) throws -> EKCalendar
|
|
{
|
|
if let id = calendarId?.trimmingCharacters(in: .whitespacesAndNewlines), !id.isEmpty,
|
|
let calendar = store.calendar(withIdentifier: id)
|
|
{
|
|
return calendar
|
|
}
|
|
|
|
if let title = calendarTitle?.trimmingCharacters(in: .whitespacesAndNewlines), !title.isEmpty {
|
|
if let calendar = store.calendars(for: .event).first(where: {
|
|
$0.title.compare(title, options: [.caseInsensitive, .diacriticInsensitive]) == .orderedSame
|
|
}) {
|
|
return calendar
|
|
}
|
|
throw NSError(domain: "Calendar", code: 6, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_NOT_FOUND: no calendar named \(title)",
|
|
])
|
|
}
|
|
|
|
if let fallback = store.defaultCalendarForNewEvents {
|
|
return fallback
|
|
}
|
|
|
|
throw NSError(domain: "Calendar", code: 7, userInfo: [
|
|
NSLocalizedDescriptionKey: "CALENDAR_NOT_FOUND: no default calendar",
|
|
])
|
|
}
|
|
|
|
private static func resolveRange(startISO: String?, endISO: String?) -> (Date, Date) {
|
|
let formatter = ISO8601DateFormatter()
|
|
let start = startISO.flatMap { formatter.date(from: $0) } ?? Date()
|
|
let end = endISO.flatMap { formatter.date(from: $0) } ?? start.addingTimeInterval(7 * 24 * 3600)
|
|
return (start, end)
|
|
}
|
|
}
|