Monorepo for Tangled tangled.org

appview: use explicit TANGLED_PDS_HANDLE_SUFFIX for tngl.sh user check #1150

open opened by boltless.me targeting master from sl/uvpzuszrulvq

also fix the isTnglHandle logic a bit.

Signed-off-by: Seongmin Lee git@boltless.me

Labels

None yet.

assignee

None yet.

Participants 2
AT URI
at://did:plc:xasnlahkri4ewmbuzly2rlc5/sh.tangled.repo.pull/3mgs6m7kcv522
+5 -3
Interdiff #0 #1
appview/config/config.go

This patch was likely rebased, as context lines do not match.

appview/settings/settings.go

This patch was likely rebased, as context lines do not match.

+1
appview/pages/funcmap.go
··· 493 493 {"Name": "hooks", "Icon": "webhook"}, 494 494 {"Name": "sites", "Icon": "globe"}, 495 495 }, 496 + "PdsUserDomain": p.pdsCfg.UserDomain, 496 497 } 497 498 }, 498 499 }
+2 -1
appview/pages/pages.go
··· 42 42 cache *TmplCache[string, *template.Template] 43 43 44 44 avatar config.AvatarConfig 45 + pdsCfg config.PdsConfig 45 46 resolver *idresolver.Resolver 46 47 db *db.DB 47 48 dev bool ··· 67 68 cache: NewTmplCache[string, *template.Template](), 68 69 dev: config.Core.Dev, 69 70 avatar: config.Avatar, 71 + pdsCfg: config.Pds, 70 72 rctx: rctx, 71 73 resolver: res, 72 74 db: database, ··· 425 427 PunchcardPreference models.PunchcardPreference 426 428 IsTnglSh bool 427 429 IsDeactivated bool 428 - PdsDomain string 429 430 HandleOpen bool 430 431 } 431 432
+2 -2
appview/pages/templates/user/settings/profile.html
··· 63 63 <input type="hidden" name="type" value="subdomain"> 64 64 <div class="flex items-stretch rounded border border-gray-200 dark:border-gray-600 overflow-hidden focus-within:ring-1 focus-within:ring-blue-500 dark:bg-gray-700"> 65 65 <input type="text" name="handle" placeholder="username" class="flex-1 px-2 py-1.5 bg-transparent dark:text-white border-0 focus:outline-none focus:ring-0 min-w-0" required> 66 - <span class="px-2 py-1.5 bg-gray-100 dark:bg-gray-600 text-gray-500 dark:text-gray-300 select-none whitespace-nowrap border-l border-gray-200 dark:border-gray-600 content-center">.{{ .PdsDomain }}</span> 66 + <span class="px-2 py-1.5 bg-gray-100 dark:bg-gray-600 text-gray-500 dark:text-gray-300 select-none whitespace-nowrap border-l border-gray-200 dark:border-gray-600 content-center">{{ const.PdsUserDomain }}</span> 67 67 </div> 68 68 <div class="flex gap-2 pt-2"> 69 69 <button type="button" popovertarget="change-handle-modal" popovertargetaction="hide" class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> ··· 104 104 </button> 105 105 </div> 106 106 </form> 107 - <a href="#" id="switch-to-subdomain" class="text-sm text-gray-400 underline hover:text-gray-600 dark:hover:text-gray-300">use a {{ .PdsDomain }} subdomain instead</a> 107 + <a href="#" id="switch-to-subdomain" class="text-sm text-gray-400 underline hover:text-gray-600 dark:hover:text-gray-300">use a {{ const.PdsUserDomain }} subdomain instead</a> 108 108 </div> 109 109 <div id="handle-error" class="text-red-500 dark:text-red-400 text-sm empty:hidden"></div> 110 110 <div id="handle-success" class="text-green-500 dark:text-green-400 text-sm empty:hidden"></div>

History

4 rounds 1 comment
sign up or login to add to the discussion
1 commit
expand
appview: use explicit TANGLED_PDS_USER_DOMAIN for user handle check
2/3 failed, 1/3 success
expand
no conflicts, ready to merge
expand 0 comments
1 commit
expand
appview: use explicit TANGLED_PDS_USER_DOMAIN for user handle check
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
appview: use explicit TANGLED_PDS_USER_DOMAIN for user handle check
expand 0 comments
1 commit
expand
appview: use explicit TANGLED_PDS_HANDLE_SUFFIX for tngl.sh user check
expand 1 comment

lgtm barring merge conflicts!