mirror of
https://github.com/sipeed/picoclaw.git
synced 2026-06-12 18:08:54 +00:00
Merge branch 'main' into version
This commit is contained in:
@@ -7,13 +7,14 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/sipeed/picoclaw/pkg"
|
||||
"github.com/sipeed/picoclaw/pkg/config"
|
||||
)
|
||||
|
||||
func ResolveTargetHome(override string) (string, error) {
|
||||
if override != "" {
|
||||
return ExpandHome(override), nil
|
||||
}
|
||||
if envHome := os.Getenv(pkg.PicoClawHome); envHome != "" {
|
||||
if envHome := os.Getenv(config.EnvHome); envHome != "" {
|
||||
return ExpandHome(envHome), nil
|
||||
}
|
||||
home, err := os.UserHomeDir()
|
||||
|
||||
@@ -132,11 +132,12 @@ type OpenClawChannels struct {
|
||||
}
|
||||
|
||||
type OpenClawTelegramConfig struct {
|
||||
BotToken *string `json:"botToken"`
|
||||
AllowFrom []string `json:"allowFrom"`
|
||||
GroupPolicy *string `json:"groupPolicy"`
|
||||
DmPolicy *string `json:"dmPolicy"`
|
||||
Enabled *bool `json:"enabled"`
|
||||
BotToken *string `json:"botToken"`
|
||||
AllowFrom []string `json:"allowFrom"`
|
||||
GroupPolicy *string `json:"groupPolicy"`
|
||||
DmPolicy *string `json:"dmPolicy"`
|
||||
Enabled *bool `json:"enabled"`
|
||||
UseMarkdownV2 *bool `json:"useMarkdownV2"`
|
||||
}
|
||||
|
||||
type OpenClawDiscordConfig struct {
|
||||
@@ -645,10 +646,11 @@ type WhatsAppConfig struct {
|
||||
}
|
||||
|
||||
type TelegramConfig struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Token string `json:"token"`
|
||||
Proxy string `json:"proxy"`
|
||||
AllowFrom []string `json:"allow_from"`
|
||||
Enabled bool `json:"enabled"`
|
||||
Token string `json:"token"`
|
||||
Proxy string `json:"proxy"`
|
||||
AllowFrom []string `json:"allow_from"`
|
||||
UseMarkdownV2 bool `json:"use_markdown_v2"`
|
||||
}
|
||||
|
||||
type FeishuConfig struct {
|
||||
@@ -777,9 +779,11 @@ func (c *OpenClawConfig) convertChannels(warnings *[]string) ChannelsConfig {
|
||||
|
||||
if c.Channels.Telegram != nil {
|
||||
enabled := c.Channels.Telegram.Enabled == nil || *c.Channels.Telegram.Enabled
|
||||
useMarkdownV2 := c.Channels.Telegram.UseMarkdownV2 != nil && *c.Channels.Telegram.UseMarkdownV2
|
||||
channels.Telegram = TelegramConfig{
|
||||
Enabled: enabled,
|
||||
AllowFrom: c.Channels.Telegram.AllowFrom,
|
||||
Enabled: enabled,
|
||||
AllowFrom: c.Channels.Telegram.AllowFrom,
|
||||
UseMarkdownV2: useMarkdownV2,
|
||||
}
|
||||
if c.Channels.Telegram.BotToken != nil {
|
||||
channels.Telegram.Token = *c.Channels.Telegram.BotToken
|
||||
|
||||
@@ -10,6 +10,11 @@ import (
|
||||
"github.com/sipeed/picoclaw/pkg/migrate/internal"
|
||||
)
|
||||
|
||||
// OpenclawHomeEnvVar is the environment variable that overrides the source
|
||||
// openclaw home directory when migrating from openclaw to picoclaw.
|
||||
// Default: ~/.openclaw
|
||||
const OpenclawHomeEnvVar = "OPENCLAW_HOME"
|
||||
|
||||
var providerMapping = map[string]string{
|
||||
"anthropic": "anthropic",
|
||||
"claude": "anthropic",
|
||||
@@ -112,7 +117,7 @@ func resolveSourceHome(override string) (string, error) {
|
||||
if override != "" {
|
||||
return internal.ExpandHome(override), nil
|
||||
}
|
||||
if envHome := os.Getenv("OPENCLAW_HOME"); envHome != "" {
|
||||
if envHome := os.Getenv(OpenclawHomeEnvVar); envHome != "" {
|
||||
return internal.ExpandHome(envHome), nil
|
||||
}
|
||||
home, err := os.UserHomeDir()
|
||||
|
||||
Reference in New Issue
Block a user