aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-11-19 16:54:07 +0100
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-11-20 15:32:55 +0100
commit583dad59590bd6423138053b67961cf39fe81d02 (patch)
treefa964fb6d55e50533a4fe10786780f6569ff2860 /lisp
parentff859ba22c23c01bdc9f4390e41eedc3254b9334 (diff)
toot count: URLs = 23 chars, handes = no domain
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mastodon-toot.el43
1 files changed, 33 insertions, 10 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 572d575..138602a 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1182,21 +1182,23 @@ REPLY-JSON is the full JSON of the toot being replied to."
(defun mastodon-toot--update-status-fields (&rest _args)
"Update the status fields in the header based on the current state."
(ignore-errors ;; called from after-change-functions so let's not leak errors
- (let ((inhibit-read-only t)
- (header-region (mastodon-tl--find-property-range 'toot-post-header
+ (let* ((inhibit-read-only t)
+ (header-region (mastodon-tl--find-property-range 'toot-post-header
+ (point-min)))
+ (count-region (mastodon-tl--find-property-range 'toot-post-counter
(point-min)))
- (count-region (mastodon-tl--find-property-range 'toot-post-counter
+ (visibility-region (mastodon-tl--find-property-range
+ 'toot-post-visibility (point-min)))
+ (nsfw-region (mastodon-tl--find-property-range 'toot-post-nsfw-flag
(point-min)))
- (visibility-region (mastodon-tl--find-property-range
- 'toot-post-visibility (point-min)))
- (nsfw-region (mastodon-tl--find-property-range 'toot-post-nsfw-flag
- (point-min)))
- (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag
- (point-min))))
+ (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag
+ (point-min)))
+ (toot-string (buffer-substring-no-properties (cdr header-region)
+ (point-max))))
(add-text-properties (car count-region) (cdr count-region)
(list 'display
(format "%s/%s characters"
- (- (point-max) (cdr header-region))
+ (mastodon-toot--count-toot-chars toot-string)
(number-to-string mastodon-toot--max-toot-chars))))
(add-text-properties (car visibility-region) (cdr visibility-region)
(list 'display
@@ -1216,6 +1218,27 @@ REPLY-JSON is the full JSON of the toot being replied to."
(list 'invisible (not mastodon-toot--content-warning)
'face 'mastodon-cw-face)))))
+(defun mastodon-toot--count-toot-chars (toot-string)
+ "Count the characters in the current toot.
+URLs always = 23, and domain names of handles are not counted.
+This is how mastodon does it."
+ (with-temp-buffer
+ (switch-to-buffer (current-buffer))
+ (insert toot-string)
+ (goto-char (point-min))
+ ;; handle URLs
+ (while (search-forward-regexp "\\w+://[^ \n]*" nil t) ; URL
+ (replace-match "xxxxxxxxxxxxxxxxxxxxxxx")) ; 23 x's
+ ;; handle @handles
+ (goto-char (point-min))
+ (while (search-forward-regexp (concat "\\(?2:@[^ @\n]+\\)" ; a handle only
+ "\\(@[^ \n]+\\)?" ; with poss domain
+ "\\b")
+ nil t)
+ (replace-match (match-string 2))) ; replace with handle only
+ (length (buffer-substring (point-min) (point-max)))))
+
+
(defun mastodon-toot--save-toot-text (&rest _args)
"Save the current toot text in `mastodon-toot-current-toot-text'.
Added to `after-change-functions' in new toot buffers."