refactor telega config

h0cheung · h0cheung · commit 3ab0439e05ab · 2021-02-03T13:24:39.000+08:00
diff --git a/init.el b/init.el
@@ -157,7 +157,7 @@
         +dragndrop       ; file drag & drop support
         +gnuplot
         +hugo
-        +journal
+        ;;+journal
         +pretty
         ;;+jupyter
         +pandoc          ; pandoc integration into org's exporter
@@ -201,7 +201,7 @@
        :h-cheung
        chinese
        (telega             ; telegram
-        +auto-method)      ; auto toggle input method
+        +auto-im)      ; auto toggle input method
        tools
        ui
        (:if (featurep! :lang cc) cc-extra)
diff --git a/modules/h-cheung/telega/+ivy-telega.el b/modules/h-cheung/telega/+ivy-telega.el
@@ -5,32 +5,50 @@
 ;;;###autoload
 (defun ivy-telega-chat-highlight (chat)
   (let ((unread (funcall (telega--tl-prop :unread_count) chat))
-        (title (telega-chat-title chat 'with-identity))
+        (title (telega-chat-title-with-brackets chat 'with-identity))
         (not-muted-p (not (telega-chat-muted-p chat)))
         (mentions (funcall (telega--tl-prop :unread_mention_count) chat)))
-
     (if (and not-muted-p (> (+ unread mentions) 0))
-        (ivy-append-face (format "%s %d@%d" title unread mentions) 'ivy-highlight-face)
+        (concat (ivy-append-face (format "%s" title) 'ivy-highlight-face)
+                "("
+                (ivy-append-face (format "%d" unread) 'telega-unread-unmuted-modeline)
+                (when (> mentions 0)
+                  (ivy-append-face (format "@%d" mentions) 'telega-mention-count))
+                ")")
       title)))
 
 ;;;###autoload
 (defun ivy-telega-chat-with ()
   "Starts chat with defined peer"
   (interactive)
-
   (telega t)
   (let ((chats (mapcar
                 (lambda (x) (cons (ivy-telega-chat-highlight x) x))
-                (telega-filter-chats telega--ordered-chats 'all))))
-    (ivy-read "chat: " chats
-              :action (lambda (x) (telega-chat--pop-to-buffer (cdr x)))
-              :caller 'ivy-telega-chat-with)))
+                (telega-filter-chats telega--ordered-chats
+                                     (if current-prefix-arg
+                                         '(or main archive)
+                                       '(and (or mention (and unread unmuted))
+                                             (or main archive)))))))
+    (cond ((null chats)
+           (user-error "No chats available."))
+          ((= 1 (length chats))
+           (telega-chat--pop-to-buffer (cdar chats)))
+          (t
+           (ivy-read "Chat with: " chats
+                     :action (lambda (x) (telega-chat--pop-to-buffer (cdr x)))
+                     :caller 'ivy-telega-chat-with)))))
 
 (setq telega-completing-read-function 'ivy-completing-read)
 
 (when (fboundp 'ivy--regex-pinyin)
   (push '(telega-chat-with . ivy--regex-pinyin) ivy-re-builders-alist)
   (push '(ivy-telega-chat-with . ivy--regex-pinyin) ivy-re-builders-alist))
 
-(map! "C-c v" #'ivy-telega-chat-with
-      "C-M-S-s-c" #'ivy-telega-chat-with)
+(map! :desc "Telega important chats"
+      "C-c v" #'ivy-telega-chat-with
+      :desc "Telega all chats"
+      "C-c c" (cmd! (let ((current-prefix-arg '(4)))
+                      (call-interactively #'ivy-telega-chat-with)))
+      :desc "Telega next important chat"
+      "C-c C-SPC" (cmd! (let ((current-prefix-arg '(4)))
+                      (call-interactively #'telega-switch-important-chat))))
diff --git a/modules/h-cheung/telega/+telega-addition.el b/modules/h-cheung/telega/+telega-addition.el
@@ -1,10 +1,10 @@
 ;;; h-cheung/telega/+addition.el -*- lexical-binding: t; -*-
 
 ;; based on cnsunyour's configs
-;;
+
 ;; Highlight current line in root buffer
 (defun lg-telega-root-mode ()
-  (hl-line-mode 1))
+  (hl-line-mode))
 (defun lg-telega-chat-update (chat)
   (with-telega-root-buffer
     (hl-line-highlight)))
@@ -30,23 +30,3 @@
             (list '(type supergroup) "[" "]")
             (list '(type channel)    "<" ">")
             (list 'all               "[" "]")))
-
-;; Links to chat/message in org-mode
-(after! org
-  (defun org-telega-follow-link (link)
-    (telega-tme-open-tg (concat "tg:telega:" link)))
-  (defun org-telega-store-link ()
-    (when-let ((link (telega-tme-internal-link-to
-                      (or (telega-msg-at (point))
-                          (telega-chat-at (point))))))
-      ;; NOTE: strip leading "tg:"
-      (let ((org-link (substring link 3)))
-        (org-link-store-props :type "telega" :link org-link)
-        org-link)))
-  (defun org-telega-complete-link ()
-    (let ((chat (telega-completing-read-chat "Chat: ")))
-      (concat "telega:" (number-to-string (plist-get chat :id)))))
-  (org-link-set-parameters "telega"
-                           :follow 'org-telega-follow-link
-                           :store 'org-telega-store-link
-                           :complete 'org-telega-complete-link))
diff --git a/modules/h-cheung/telega/+telega-auto-im.el b/modules/h-cheung/telega/+telega-auto-im.el
@@ -1,4 +1,4 @@
-;;; h-cheung/telega/+auto-method.el -*- lexical-binding: t; -*-
+;;; h-cheung/telega/+telega-auto-im.el -*- lexical-binding: t; -*-
 
 ;; based on cnsunyour's configs
 
@@ -56,10 +56,12 @@
                      (telega-chat-title chat)
                      "\"] is removed from EN/CN chat list."))))
 
-(defadvice! +toggle-input-method--telega-chat-mode-a (chat &optional no-history-load)
+;; Determine the function which has advice is available.
+(unless (fboundp 'telega-chat--pop-to-buffer)
+  (error "Function `telega-chat--pop-to-buffer' is not available."))
+(define-advice telega-chat--pop-to-buffer (:after (chat &rest _) toggle-input-method-a)
   "在 telega-chat-mode 里根据 chat 名称切换输入法，如果名称包含
 中文，则激活中文输入法，否则关闭中文输入法"
-  :after #'telega-chat--pop-to-buffer
   (let ((title (telega-chat-title chat))
         (chatid (plist-get chat :id)))
     (cond ((member chatid +telega--chat-cn-list) (activate-input-method default-input-method))
@@ -68,7 +70,3 @@
           ((telega-chat-private-p chat) (activate-input-method default-input-method))
           ((string-match-p "\\cc" title) (activate-input-method default-input-method))
           (t (deactivate-input-method)))))
-
-;; Determine the function which has advice is available.
-(unless (fboundp 'telega-chat--pop-to-buffer)
-  (error "Function `telega-chat--pop-to-buffer' is not available."))
diff --git a/modules/h-cheung/telega/config.el b/modules/h-cheung/telega/config.el
@@ -4,72 +4,84 @@
 
 ;; telegram client for emacs
 (use-package! telega
-  :commands (telega)
   :defer t
-  :bind ("C-M-S-s-t" . #'telega)
   :custom
   ;; (telega-proxies (list '(:server "127.0.0.1" :port 1086 :enable t
   ;;                         :type (:@type "proxyTypeSocks5"))))
-  (telega-chat-reply-prompt "<<< ")
-  (telega-chat-edit-prompt "+++ ")
+  (telega-open-file-function 'org-open-file)
+  (telega-chat-input-prompt '((prompt . ">>> ")
+                              (reply . "<<< ")
+                              (edit . "+++ ")))
+  (telega-chat-input-anonymous-prompt '((prompt . "Anonymous>>> ")
+                                        (reply . "Anonymous<<< ")
+                                        (edit . "Anonymous+++ ")))
+  (telega-chat-input-comment-prompt '((prompt . "Comment>>> ")
+                                      (reply . "Comment<<< ")
+                                      (edit . "Comment+++ ")))
   (telega-sticker-size '(8 . 48))
-  (telega-chat-use-markdown-version nil)
   (telega-animation-play-inline t)
   (telega-emoji-use-images nil)
   (telega-sticker-set-download t)
- ;; (telega-use-tracking-for '(or pin (label "⌘")))
   (telega-chat-show-deleted-messages-for '(all))
+
   :init
   (setq telega-use-images (or (display-graphic-p) (daemonp)))
-
+  (define-key global-map (kbd "C-c t") telega-prefix-map)
+  (which-key-add-keymap-based-replacements global-map
+    (kbd "C-c t") '("telega"))
   (when (featurep! :completion ivy)
     (load! "+ivy-telega"))
 
   :hook
   (telega-chat-mode . yas-minor-mode-on)
-  (telega-chat-mode . visual-line-mode)
+  ;; (telega-chat-mode . visual-line-mode)
   (telega-chat-mode . (lambda ()
                         (set-company-backend! 'telega-chat-mode
                           (append '(telega-company-emoji
                                     telega-company-username
                                     telega-company-hashtag)
                                   (when (telega-chat-bot-p telega-chatbuf--chat)
                                     '(telega-company-botcmd))))))
-  (telega-chat-pre-message . telega-msg-ignore-blocked-sender)
+                                        ;(telega-chat-pre-message . telega-msg-ignore-blocked-sender)
+  (telega-load . telega-mode-line-mode)
+  (telega-load . global-telega-url-shorten-mode)
+  (telega-load . global-telega-mnz-mode)
+
   :config
+  (setq telega-mode-line-string-format
+        (cl-remove '(:eval (telega-mode-line-icon))
+                   telega-mode-line-string-format
+                   :test #'equal))
+  (add-hook 'telega-msg-ignore-predicates 'telega-msg-from-blocked-sender-p)
 
-  (when (featurep! +auto-method)
-    (load! "+telega-auto-method"))
+  (when (featurep! +auto-im)
+    (load! "+telega-auto-im"))
 
-  ; (set-evil-initial-state! '(telega-root-mode telega-chat-mode) 'emacs)
+                                        ; (set-evil-initial-state! '(telega-root-mode telega-chat-mode) 'emacs)
   (when (featurep! :editor evil)
     (map!
      (:map telega-msg-button-map
-       "J" #'telega-button-forward
-       "k" nil
-       "K" #'telega-button-backward
-       "p" #'telega-msg-redisplay
-       "l" nil))
+      "J" #'telega-button-forward
+      "k" nil
+      "K" #'telega-button-backward
+      "p" #'telega-msg-redisplay
+      "l" nil))
     (map!
      :map telega-chat-button-map
-      "h" nil))
+     "h" nil))
 
   ;; use RET to add newline and C-RET to send
   (when (featurep! :config default)
     (map! :map telega-chat-mode-map
-      "RET"              #'+default/newline-below
-      "<C-return>"       #'telega-chatbuf-input-send))
-
-  (pushnew! telega-known-inline-bots
-            "@vid" "@bing" "@wiki" "@imdb")
+          "C-c C-t"          #'telega-chatbuf-attach-sticker
+          "RET"              nil
+          "<C-return>"       #'telega-chatbuf-input-send))
 
   (set-popup-rule! (regexp-quote telega-root-buffer-name)
     :ignore t)
   ;; (set-popup-rule! "^◀[^◀\[]*[\[({<].+[\])}>]"
   ;;   :side 'right :size 100 :select t :ttl 300 :quit nil :modeline t)
 
-  (telega-mode-line-mode 1)
-  (telega-url-shorten-mode 1)
   (when (and IS-LINUX (boundp 'dbus-runtime-version))
     (telega-notifications-mode 1))
 
@@ -84,7 +96,9 @@
                                     :heigt 1.0
                                     :v-adjust -0.2
                                     :face all-the-icons-blue)))
+  (use-package! telega-stories
+    :config
+    (telega-stories-mode 1)
+    (map! :map telega-root-mode-map "v e" 'telega-view-emacs-stories))
+
   (load! "+telega-addition"))
-  ;; (advice-add 'telega-root--killed :around (lambda ())))
-  ;; (when (daemonp)
-  ;;   (telega nil)))
diff --git a/modules/h-cheung/telega/packages.el b/modules/h-cheung/telega/packages.el
@@ -2,3 +2,4 @@
 ;;; h-cheung/telega/packages.el
 
 (package! telega :recipe (:files (:defaults "contrib/*.el" "etc" "server" "Makefile")))
+(package! language-detection)

Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@`
`2`	`2`	`;;; h-cheung/telega/packages.el`
`3`	`3`
`4`	`4`	`(package! telega :recipe (:files (:defaults "contrib/*.el" "etc" "server" "Makefile")))`
	`5`	`+(package! language-detection)`