1 files changed, 38 insertions, 0 deletions

@@ -252,6 +252,7 @@ post() {
         printf 'Twt: ' >&2
         read -r post
 
+        post="$(post_expand_ats "$post")"
 
         if printf '%s\n' "$post" | grep -qE '^[ \t\n]$'
         then
@@ -264,6 +265,43 @@ post() {
         rm "$TWERK_CACHE/$TWERK_USER"
         remain
 }
+
+post_expand_ats() {
+        TWERK_POST="$TWERK_CACHE/:post:"
+        printf '%s\n' "$@" |
+                tr ' ' '\n' |
+                while read -r word; do
+                        case "$word" in
+                                @*)
+                                        url="$(grep "${word#@}" "$TWERK_FEEDS" | cut -d' ' -f1)"
+                                        if test -n "$url"
+                                        then
+                                                printf '@<%s %s> ' \
+                                                       "${word#@}" "$url"
+                                        else
+                                                printf '%s ' "$word"
+                                        fi
+                                        ;;
+                                *) printf '%s ' "$word";;
+                        esac
+                done > "$TWERK_POST"
+        echo >> "$TWERK_POST"
+
+        if grep -q @ "$TWERK_POST"
+        then
+                cat "$TWERK_POST" >&2
+                printf '%s\n' "Correct? [Y/n] " >&2
+                read -r yn
+                case "$yn" in
+                        n*|N*)
+                                head -n1 "$TWERK_POST" >&2
+                                post
+                                ;;
+                        y*|Y*|'') ;;
+                        *) return 3 ;;
+                esac
+        fi
+        head -n1 "$TWERK_POST"
 }
 
 refresh() {