amy/amsterdam
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

bug fixes to Find and Member List due to outdated function definitions

Browse Source
This commit is contained in:
Amy G. Bowersox
2026-01-30 22:11:49 -07:00
parent a0d3f3715a
commit 4151e99528
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/templates.go
+25 -1
View File
@@ -1,6 +1,6 @@
/*
* Amsterdam Web Communities System
* Copyright (c) 2025 Erbosoft Metaverse Design Solutions, All Rights Reserved
* Copyright (c) 2025-2026 Erbosoft Metaverse Design Solutions, All Rights Reserved
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -122,6 +122,28 @@ func extractCommunityLogo(a jet.Arguments) reflect.Value {
return reflect.ValueOf(rc)
}
// communityHost retrieves the community host for a community.
func communityHost(a jet.Arguments) reflect.Value {
comm := a.Get(0).Convert(reflect.TypeFor[*database.Community]()).Interface().(*database.Community)
ctxt := a.Get(1).Convert(reflect.TypeFor[AmContext]()).Interface().(AmContext)
u, err := comm.Host(ctxt.Ctx())
if err != nil {
u, _ = database.AmGetAnonUser(ctxt.Ctx())
}
return reflect.ValueOf(u)
}
// userContactInfo retrieves the contact info for a user.
func userContactInfo(a jet.Arguments) reflect.Value {
user := a.Get(0).Convert(reflect.TypeFor[*database.User]()).Interface().(*database.User)
ctxt := a.Get(1).Convert(reflect.TypeFor[AmContext]()).Interface().(AmContext)
ci, err := user.ContactInfo(ctxt.Ctx())
if err != nil {
ci = database.AmNewUserContactInfo(0)
}
return reflect.ValueOf(ci)
}
// displayDateTime formats a date and time value.
func displayDateTime(a jet.Arguments) reflect.Value {
timeval := a.Get(0).Convert(reflect.TypeFor[time.Time]()).Interface().(time.Time)
@@ -286,6 +308,8 @@ func SetupTemplates() {
views.AddGlobalFunc("MakeIntRange", makeIntRange)
views.AddGlobalFunc("MakeYearRange", makeYearRange)
views.AddGlobalFunc("ExtractCommunityLogo", extractCommunityLogo)
views.AddGlobalFunc("CommunityHost", communityHost)
views.AddGlobalFunc("UserContactInfo", userContactInfo)
views.AddGlobalFunc("DisplayActivity", displayActivity)
views.AddGlobalFunc("DisplayDateTime", displayDateTime)
views.AddGlobalFunc("DisplayMemberCount", displayMemberCount)
ui/views/find.jet
+5 -5
View File
@@ -1,6 +1,6 @@
{*
* Amsterdam Web Communities System
* Copyright (c) 2025 Erbosoft Metaverse Design Solutions, All Rights Reserved
* Copyright (c) 2025-2026 Erbosoft Metaverse Design Solutions, All Rights Reserved
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -102,7 +102,7 @@
class="px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
<option value="st" {{ if oper == "st" }}selected{{ end }}>starts with the string</option>
<option value="in" {{ if oper == "in" }}selected{{ end }}>contains the string</option>
<option value="re" {{ if oper == "in" }}selected{{ end }}>matches the regular expression</option>
<option value="re" {{ if oper == "re" }}selected{{ end }}>matches the regular expression</option>
</select>
<input type="text" name="term" size="32" maxlength="255" value="{{ term }}"
placeholder="Enter search term..."
@@ -117,7 +117,7 @@
class="px-3 py-2 border border-gray-300 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
<option value="st" {{ if oper == "st" }}selected{{ end }}>starts with the string</option>
<option value="in" {{ if oper == "in" }}selected{{ end }}>contains the string</option>
<option value="re" {{ if oper == "in" }}selected{{ end }}>matches the regular expression</option>
<option value="re" {{ if oper == "re" }}selected{{ end }}>matches the regular expression</option>
</select>
</div>
<!-- Search Criteria -->
@@ -217,7 +217,7 @@
<div class="text-sm text-gray-700 space-y-1">
<div>
<span class="font-medium">Host:</span>
{{ h := rx.HostQ() }}
{{ h := CommunityHost(rx, .) }}
<a href="/user/{{ h.Username }}" class="text-blue-700 hover:text-blue-900">{{ h.Username }}</a>
<span class="mx-2">-</span>
{{ n := DisplayMemberCount(rx, .) }}
@@ -245,7 +245,7 @@
</div>
<div class="text-sm text-gray-700 space-y-1">
<div>
{{ ci := rx.ContactInfoQ() }}
{{ ci := UserContactInfo(rx, .) }}
{{ DisplayFullName(ci) }}, from {{ ci.Locality }}, {{ ci.Region }} {{ ci.Country }}
</div>
</div>
ui/views/memberlist.jet
+2 -2
View File
@@ -1,6 +1,6 @@
{*
* Amsterdam Web Communities System
* Copyright (c) 2025 Erbosoft Metaverse Design Solutions, All Rights Reserved
* Copyright (c) 2025-2026 Erbosoft Metaverse Design Solutions, All Rights Reserved
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -104,7 +104,7 @@
</div>
<div class="text-sm text-gray-700 space-y-1">
<div>
{{ ci := rx.ContactInfoQ() }}
{{ ci := UserContactInfo(rx, .) }}
{{ DisplayFullName(ci) }}, from {{ ci.Locality }}, {{ ci.Region }} {{ ci.Country }}
</div>
</div>