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.
134 lines
5.5 KiB
Swift
134 lines
5.5 KiB
Swift
import EventKit
|
|
import Foundation
|
|
import BotKit
|
|
|
|
final class RemindersService: RemindersServicing {
|
|
func list(params: HanzoBotRemindersListParams) async throws -> HanzoBotRemindersListPayload {
|
|
let store = EKEventStore()
|
|
let status = EKEventStore.authorizationStatus(for: .reminder)
|
|
let authorized = EventKitAuthorization.allowsRead(status: status)
|
|
guard authorized else {
|
|
throw NSError(domain: "Reminders", code: 1, userInfo: [
|
|
NSLocalizedDescriptionKey: "REMINDERS_PERMISSION_REQUIRED: grant Reminders permission",
|
|
])
|
|
}
|
|
|
|
let limit = max(1, min(params.limit ?? 50, 500))
|
|
let statusFilter = params.status ?? .incomplete
|
|
|
|
let predicate = store.predicateForReminders(in: nil)
|
|
let payload = try await withCheckedThrowingContinuation { (cont: CheckedContinuation<[HanzoBotReminderPayload], Error>) in
|
|
store.fetchReminders(matching: predicate) { items in
|
|
let formatter = ISO8601DateFormatter()
|
|
let filtered = (items ?? []).filter { reminder in
|
|
switch statusFilter {
|
|
case .all:
|
|
return true
|
|
case .completed:
|
|
return reminder.isCompleted
|
|
case .incomplete:
|
|
return !reminder.isCompleted
|
|
}
|
|
}
|
|
let selected = Array(filtered.prefix(limit))
|
|
let payload = selected.map { reminder in
|
|
let due = reminder.dueDateComponents.flatMap { Calendar.current.date(from: $0) }
|
|
return HanzoBotReminderPayload(
|
|
identifier: reminder.calendarItemIdentifier,
|
|
title: reminder.title,
|
|
dueISO: due.map { formatter.string(from: $0) },
|
|
completed: reminder.isCompleted,
|
|
listName: reminder.calendar.title)
|
|
}
|
|
cont.resume(returning: payload)
|
|
}
|
|
}
|
|
|
|
return HanzoBotRemindersListPayload(reminders: payload)
|
|
}
|
|
|
|
func add(params: HanzoBotRemindersAddParams) async throws -> HanzoBotRemindersAddPayload {
|
|
let store = EKEventStore()
|
|
let status = EKEventStore.authorizationStatus(for: .reminder)
|
|
let authorized = EventKitAuthorization.allowsWrite(status: status)
|
|
guard authorized else {
|
|
throw NSError(domain: "Reminders", code: 2, userInfo: [
|
|
NSLocalizedDescriptionKey: "REMINDERS_PERMISSION_REQUIRED: grant Reminders permission",
|
|
])
|
|
}
|
|
|
|
let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
guard !title.isEmpty else {
|
|
throw NSError(domain: "Reminders", code: 3, userInfo: [
|
|
NSLocalizedDescriptionKey: "REMINDERS_INVALID: title required",
|
|
])
|
|
}
|
|
|
|
let reminder = EKReminder(eventStore: store)
|
|
reminder.title = title
|
|
if let notes = params.notes?.trimmingCharacters(in: .whitespacesAndNewlines), !notes.isEmpty {
|
|
reminder.notes = notes
|
|
}
|
|
reminder.calendar = try Self.resolveList(
|
|
store: store,
|
|
listId: params.listId,
|
|
listName: params.listName)
|
|
|
|
if let dueISO = params.dueISO?.trimmingCharacters(in: .whitespacesAndNewlines), !dueISO.isEmpty {
|
|
let formatter = ISO8601DateFormatter()
|
|
guard let dueDate = formatter.date(from: dueISO) else {
|
|
throw NSError(domain: "Reminders", code: 4, userInfo: [
|
|
NSLocalizedDescriptionKey: "REMINDERS_INVALID: dueISO must be ISO-8601",
|
|
])
|
|
}
|
|
reminder.dueDateComponents = Calendar.current.dateComponents(
|
|
[.year, .month, .day, .hour, .minute, .second],
|
|
from: dueDate)
|
|
}
|
|
|
|
try store.save(reminder, commit: true)
|
|
|
|
let formatter = ISO8601DateFormatter()
|
|
let due = reminder.dueDateComponents.flatMap { Calendar.current.date(from: $0) }
|
|
let payload = HanzoBotReminderPayload(
|
|
identifier: reminder.calendarItemIdentifier,
|
|
title: reminder.title,
|
|
dueISO: due.map { formatter.string(from: $0) },
|
|
completed: reminder.isCompleted,
|
|
listName: reminder.calendar.title)
|
|
|
|
return HanzoBotRemindersAddPayload(reminder: payload)
|
|
}
|
|
|
|
private static func resolveList(
|
|
store: EKEventStore,
|
|
listId: String?,
|
|
listName: String?) throws -> EKCalendar
|
|
{
|
|
if let id = listId?.trimmingCharacters(in: .whitespacesAndNewlines), !id.isEmpty,
|
|
let calendar = store.calendar(withIdentifier: id)
|
|
{
|
|
return calendar
|
|
}
|
|
|
|
if let title = listName?.trimmingCharacters(in: .whitespacesAndNewlines), !title.isEmpty {
|
|
if let calendar = store.calendars(for: .reminder).first(where: {
|
|
$0.title.compare(title, options: [.caseInsensitive, .diacriticInsensitive]) == .orderedSame
|
|
}) {
|
|
return calendar
|
|
}
|
|
throw NSError(domain: "Reminders", code: 5, userInfo: [
|
|
NSLocalizedDescriptionKey: "REMINDERS_LIST_NOT_FOUND: no list named \(title)",
|
|
])
|
|
}
|
|
|
|
if let fallback = store.defaultCalendarForNewReminders() {
|
|
return fallback
|
|
}
|
|
|
|
throw NSError(domain: "Reminders", code: 6, userInfo: [
|
|
NSLocalizedDescriptionKey: "REMINDERS_LIST_NOT_FOUND: no default list",
|
|
])
|
|
}
|
|
}
|