Un-@ and fix a merge I botched.
authorPete <pete@debu.gs>
Wed, 21 Oct 2020 03:28:41 +0000 (20:28 -0700)
committerPete <pete@debu.gs>
Wed, 21 Oct 2020 03:28:41 +0000 (20:28 -0700)
templates/notification.tmpl
templates/status.tmpl
templates/userlist.tmpl

index be24f2576982d8119ed706723f1f3193c65390b3..284a3ee494e62ac472bc4185cf53a94b5eab94d9 100644 (file)
@@ -37,7 +37,7 @@
                                </span>
                        </div>
                        <div>
-                               <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a>
+                               <a href="/user/{{.Account.ID}}"> <span class="status-uname"> {{.Account.Acct}} </span> </a>
                        </div>
                </div>
        </div>
@@ -51,7 +51,7 @@
                        <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
                </a>
                <a href="/user/{{.Account.ID}}">
-                       <span class="status-uname"> @{{.Account.Acct}} </span>
+                       <span class="status-uname"> {{.Account.Acct}} </span>
                </a>
                <span> retweeted your post </span>
                <span>
                <a class="img-link" href="/user/{{.Account.ID}}">
                        <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
                </a>
-               <a href="/user/{{.Account.ID}}">
-                       <span class="status-uname"> @{{.Account.Acct}} </span>
-               </a>
-<<<<<<< HEAD
                <a class="nav-link" href="/user/{{.Account.ID}}">
                        <span class="status-uname"> {{.Account.Acct}} </span>
                </a>
                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-=======
->>>>>>> 9a82a7d91492e3143332d98a6cea1dd644913287
                <span> liked your post </span>
                <span>
                        - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
index 51f8ca862b1729365ce36eb36749ba30965f9c45..2aa1a5fd36399af8233db6c57c9b547e6a38427e 100644 (file)
@@ -10,7 +10,7 @@
                </a>
                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
                <a href="/user/{{.Account.ID}}"> 
-                       <span class="status-uname"> @{{.Account.Acct}} </span> 
+                       <span class="status-uname"> {{.Account.Acct}} </span> 
                </a>
                retweeted
        </div>
@@ -27,7 +27,7 @@
                <div class="status"> 
                        <div class="status-name">
                                <a href="/user/{{.Account.ID}}">
-                                       <span class="status-uname"> @{{.Account.Acct}} </span>
+                                       <span class="status-uname"> {{.Account.Acct}} </span>
                                </a>
                                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> 
                                <div class="more-container">
@@ -75,7 +75,7 @@
                                {{if .InReplyToID}}
                                <div class="status-reply-to">
                                        <a class="status-reply-to-link" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> 
-                                                in reply to {{if .IDNumbers}}#{{index .IDNumbers .InReplyToID}}{{end}} {{if .Pleroma.InReplyToAccountAcct}}@{{.Pleroma.InReplyToAccountAcct}}{{else if not .IDNumbers}}{{.InReplyToID}}{{end}}
+                                                in reply to {{if .IDNumbers}}#{{index .IDNumbers .InReplyToID}}{{end}} {{if .Pleroma.InReplyToAccountAcct}}{{.Pleroma.InReplyToAccountAcct}}{{else if not .IDNumbers}}{{.InReplyToID}}{{end}}
                                        </a>
                                </div>
                                {{if index .IDReplies .ID}} <span class="status-reply-info-divider"> - </span> {{end}}
index 5a1bd5c23b75fdc04d64088dba78c5fdd87e6d24..204f3cbe06e9f77ed9d1e682c6663b760e924d65 100644 (file)
@@ -9,7 +9,7 @@
                </div>
                <div class="user-list-name">
                        <a class="img-link" href="/user/{{.ID}}">
-                               <div class="status-uname"> @{{.Acct}} </div>
+                               <div class="status-uname"> {{.Acct}} </div>
                        </a>
                        <div class="status-dname"> {{EmojiFilter .DisplayName .Emojis}} </div>  
                </div>