mstar/linstrom
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Compare commits

base: mstar:da518345d5b60e96cca1fed52aed272ff3c9bfca
Branches Tags
mstar:main
..
compare: mstar:f2616c041b80facb159432d2c8c7e0f004676d55
Branches Tags
mstar:main

No commits in common. "da518345d5b60e96cca1fed52aed272ff3c9bfca" and "f2616c041b80facb159432d2c8c7e0f004676d55" have entirely different histories.
da518345d5 ... f2616c041b

15 changed files with 17 additions and 166 deletions
Show stats Expand all files Collapse all files

26
.forgejo/workflows/build-docker.yml
View file

@ -1,26 +0,0 @@
on:
push:
branches:
- main
jobs:
docker:
runs-on: ubuntu-22.04
steps:
# - run: "echo reg: ${{ env.GITHUB_SERVER_URL }}, act: ${{ github.actor }}, sec: ${{ github.token }}"
- name: Login to Registry
uses: docker/login-action@v3
with:
registry: ${{ env.GITHUB_SERVER_URL }}
username: ${{ github.actor }}
password: ${{ secrets.REG_TOKEN }}
# -
# name: Set up QEMU
# uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build and push
uses: docker/build-push-action@v6
with:
push: true
tags: git.mstar.dev/${{ env.GITHUB_REPOSITORY }}:latest

1
Code-Style.md
View file

@ -17,7 +17,6 @@
and given appropriate descriptive information
_or_ return an error defined (as public variable) in that package.
Example: `other.Error("auth", "failed to do something important", originalError)`
- Returned http errors must use `git.mstar.dev/mstar/goutils/webutils.ProblemDetails(StatusOnly)`.
## JS/TS

16
Dockerfile → Containerfile
View file

@ -1,24 +1,10 @@
FROM docker.io/node:22 AS build-ember
# TODO: Implement ember frontend build
COPY . /app
WORKDIR /app/frontend-reactive
RUN npm install && npm run build
FROM docker.io/golang:1.23 AS build-go
# TODO: Implement golang build
COPY --from=build-ember /app /app
WORKDIR /app
RUN CGO_ENABLED=0 go build -o /app/linstrom .
# FROM fedora:latest AS release
FROM alpine:3 AS release
FROM gcr.io/distroless/static-debian12:latest as release
# TODO: Implement final release container
COPY --from=build-go /app/linstrom /linstrom
ENTRYPOINT ["/linstrom"]
# OCI labels, following https://github.com/opencontainers/image-spec/blob/main/annotations.md
# Make this one dynamic

2
go.mod
View file

@ -5,7 +5,7 @@ go 1.23.0
toolchain go1.23.7
require (
git.mstar.dev/mstar/goutils v1.12.3
git.mstar.dev/mstar/goutils v1.12.1
github.com/BurntSushi/toml v1.4.0
github.com/dgraph-io/ristretto v0.2.0
github.com/eko/gocache/lib/v4 v4.1.6

4
go.sum
View file

@ -61,10 +61,6 @@ git.mstar.dev/mstar/goutils v1.12.0 h1:d88hLS8KnLUCI+8aWBR6228M43hxHdJpj8WuSqm4L
git.mstar.dev/mstar/goutils v1.12.0/go.mod h1:juxY0eZEMnA95fedRp2LVXvUBgEjz66nE8SEdGKcxMA=
git.mstar.dev/mstar/goutils v1.12.1 h1:HZKKzMNfx7JKSUi5s8SwwUFEqEX6xvkM6NMf+Pht+lo=
git.mstar.dev/mstar/goutils v1.12.1/go.mod h1:juxY0eZEMnA95fedRp2LVXvUBgEjz66nE8SEdGKcxMA=
git.mstar.dev/mstar/goutils v1.12.2 h1:twCnsl+WRgP52mV5D5FRVJK6Yst1/3VtulHd77U++BY=
git.mstar.dev/mstar/goutils v1.12.2/go.mod h1:juxY0eZEMnA95fedRp2LVXvUBgEjz66nE8SEdGKcxMA=
git.mstar.dev/mstar/goutils v1.12.3 h1:Wx7i8/a99Cp+Y/XcXgqQr0r9cSsJu7QkWBlKyprTH44=
git.mstar.dev/mstar/goutils v1.12.3/go.mod h1:juxY0eZEMnA95fedRp2LVXvUBgEjz66nE8SEdGKcxMA=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=

2
main.go
View file

@ -154,7 +154,7 @@ func newServer() {
if *shared.FlagStartDebugServer {
go func() {
log.Info().Msg("Starting debug server")
if err = webdebug.New(*shared.FlagDebugPort).Start(); err != nil {
if err = webdebug.New().Start(); err != nil {
log.Fatal().Err(err).Msg("Debug server failed")
}
}()

5
shared/flags.go
View file

@ -25,11 +25,6 @@ var (
false,
"Also start the local debugging server",
)
FlagDebugPort *string = flag.String(
"debugport",
"127.0.0.1:3305",
"Set the address the debug server will listen on. Format: IP:Port",
)
FlagLogFile *string = flag.String(
"logfile",
"/var/log/linstrom/logs",

4
web/debug/posts.go
View file

@ -8,7 +8,7 @@ import (
webutils "git.mstar.dev/mstar/goutils/http"
"git.mstar.dev/mstar/goutils/sliceutils"
"github.com/rs/zerolog/hlog"
"github.com/rs/zerolog/log"
"gorm.io/gorm"
"git.mstar.dev/mstar/linstrom/storage-new"
@ -22,7 +22,6 @@ func postAs(w http.ResponseWriter, r *http.Request) {
Username string `json:"username"`
Content string `json:"content"`
}
log := hlog.FromRequest(r)
dec := json.NewDecoder(r.Body)
data := Inbound{}
err := dec.Decode(&data)
@ -77,7 +76,6 @@ func postAs(w http.ResponseWriter, r *http.Request) {
}
func notesFrom(w http.ResponseWriter, r *http.Request) {
log := hlog.FromRequest(r)
username := r.FormValue("username")
user, err := dbgen.User.GetByUsername(username)
if err != nil {

13
web/debug/server.go
View file

@ -12,15 +12,15 @@ package webdebug
import (
"context"
"net/http"
webutils "git.mstar.dev/mstar/goutils/http"
)
const DebugAddr = "127.0.0.1:3305"
type Server struct {
server *http.Server
}
func New(addr string) *Server {
func New() *Server {
handler := http.NewServeMux()
handler.HandleFunc("GET /non-deleted", getNonDeletedUsers)
handler.HandleFunc("POST /local-user", createLocalUser)
@ -28,11 +28,8 @@ func New(addr string) *Server {
handler.HandleFunc("POST /post-as", postAs)
handler.HandleFunc("GET /notes-for", notesFrom)
web := http.Server{
Addr: addr,
Handler: webutils.ChainMiddlewares(
handler,
webutils.BuildLoggingMiddleware(map[string]string{"server": "debug"}),
),
Addr: DebugAddr,
Handler: handler,
}
return &Server{&web}
}

25
web/debug/users.go
View file

@ -11,7 +11,7 @@ import (
webutils "git.mstar.dev/mstar/goutils/http"
"git.mstar.dev/mstar/goutils/other"
"git.mstar.dev/mstar/goutils/sliceutils"
"github.com/rs/zerolog/hlog"
"github.com/rs/zerolog/log"
"git.mstar.dev/mstar/linstrom/shared"
"git.mstar.dev/mstar/linstrom/storage-new/dbgen"
@ -20,38 +20,18 @@ import (
)
func getNonDeletedUsers(w http.ResponseWriter, r *http.Request) {
log := hlog.FromRequest(r)
pageStr := r.FormValue("page")
page := 0
if pageStr != "" {
var err error
page, err = strconv.Atoi(pageStr)
if err != nil {
webutils.ProblemDetails(
w,
http.StatusBadRequest,
"/errors/bad-page",
"bad page number",
other.IntoPointer("page number must be an uint"),
nil,
)
return
}
if page < 0 {
webutils.ProblemDetails(
w,
http.StatusBadRequest,
"/errors/bad-page",
"bad page number",
other.IntoPointer("page number must be >= 0"),
nil,
)
webutils.HttpErr(w, 0, "page is not a number", http.StatusBadRequest)
return
}
}
users, err := dbgen.User.GetPagedAllNonDeleted(uint(page))
if err != nil {
log.Error().Err(err).Int("page", page).Msg("Failed to get non-deleted users")
webutils.ProblemDetails(
w,
http.StatusInternalServerError,
@ -78,7 +58,6 @@ func createLocalUser(w http.ResponseWriter, r *http.Request) {
Location *string `json:"location"`
IsBot bool `json:"is_bot"`
}
log := hlog.FromRequest(r)
jsonDecoder := json.NewDecoder(r.Body)
data := Inbound{}
err := jsonDecoder.Decode(&data)

71
web/public/api/activitypub/user.go
View file

@ -8,61 +8,17 @@ import (
"time"
webutils "git.mstar.dev/mstar/goutils/http"
"git.mstar.dev/mstar/goutils/other"
"git.mstar.dev/mstar/goutils/sliceutils"
"github.com/rs/zerolog/hlog"
"git.mstar.dev/mstar/linstrom/config"
"git.mstar.dev/mstar/linstrom/storage-new"
"git.mstar.dev/mstar/linstrom/storage-new/dbgen"
"git.mstar.dev/mstar/linstrom/storage-new/models"
webshared "git.mstar.dev/mstar/linstrom/web/shared"
)
var baseLdContext = []any{
"https://www.w3.org/ns/activitystreams",
"https://w3id.org/security/v1",
map[string]any{
"Key": "sec:Key",
"manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
"sensitive": "as:sensitive",
"Hashtag": "as:Hashtag",
"quoteUrl": "as:quoteUrl",
"fedibird": "http://fedibird.com/ns#",
"quoteUri": "fedibird:quoteUri",
"toot": "http://joinmastodon.org/ns#",
"Emoji": "toot:Emoji",
"featured": "toot:featured",
"discoverable": "toot:discoverable",
"indexable": "toot:indexable",
"schema": "http://schema.org#",
"PropertyValue": "schema:PropertyValue",
"value": "schema:value",
"misskey": "https://misskey-hub.net/ns#",
"_misskey_content": "misskey:_misskey_content",
"_misskey_quote": "misskey:_misskey_quote",
"_misskey_reaction": "misskey:_misskey_reaction",
"_misskey_votes": "misskey:_misskey_votes",
"_misskey_summary": "misskey:_misskey_summary",
"_misskey_followedMessage": "misskey:_misskey_followedMessage",
"_misskey_requireSigninToViewContents": "misskey:_misskey_requireSigninToViewContents",
"_misskey_makeNotesFollowersOnlyBefore": "misskey:_misskey_makeNotesFollowersOnlyBefore",
"_misskey_makeNotesHiddenBefore": "misskey:_misskey_makeNotesHiddenBefore",
"_misskey_license": "misskey:_misskey_license",
"freeText": map[string]string{
"@id": "misskey:freeText",
"@type": "schema:text",
},
"isCat": "misskey:isCat",
"firefish": "https://joinfirefish.org/ns#",
"speakAsCat": "firefish:speakAsCat",
"sharkey": "https://joinsharkey.org/ns#",
"hideOnlineStatus": "sharkey:hideOnlineStatus",
"backgroundUrl": "sharkey:backgroundUrl",
"listenbrainz": "sharkey:listenbrainz",
"enableRss": "sharkey:enableRss",
"vcard": "http://www.w3.org/2006/vcard/ns#",
},
}
func users(w http.ResponseWriter, r *http.Request) {
@ -89,18 +45,11 @@ func users(w http.ResponseWriter, r *http.Request) {
PublicUrl string `json:"url"`
Icon *OutboundMedia `json:"icon,omitempty"`
Banner *OutboundMedia `json:"image,omitempty"`
Discoverable bool `json:"discoverable"`
Location *string `json:"vcard:Address,omitempty"`
Birthday *string `json:"vcard:bday,omitempty"`
SpeakAsCat bool `json:"speakAsCat"`
IsCat bool `json:"isCat"`
RestrictedFollow bool `json:"manuallyApprovesFollowers"`
}
log := hlog.FromRequest(r)
userId := r.PathValue("id")
user, err := dbgen.User.Where(dbgen.User.ID.Eq(userId)).
Preload(dbgen.User.Icon).Preload(dbgen.User.Banner).
Preload(dbgen.User.BeingTypes).
First()
if err != nil {
webutils.ProblemDetails(w, 500, "/errors/db-failure", "internal database failure", nil, nil)
@ -130,11 +79,9 @@ func users(w http.ResponseWriter, r *http.Request) {
Owner: apUrl,
Pem: keyBytes,
},
Published: user.CreatedAt,
DisplayName: user.DisplayName,
PublicUrl: config.GlobalConfig.General.GetFullPublicUrl() + "/user/" + user.Username,
Discoverable: user.Indexable,
RestrictedFollow: user.RestrictedFollow,
Published: user.CreatedAt,
DisplayName: user.DisplayName,
PublicUrl: config.GlobalConfig.General.GetFullPublicUrl() + "/user/" + user.Username,
}
if user.Description != "" {
data.Description = &user.Description
@ -155,18 +102,6 @@ func users(w http.ResponseWriter, r *http.Request) {
MediaType: user.Banner.Type,
}
}
if sliceutils.ContainsFunc(user.BeingTypes, func(t models.UserToBeing) bool {
return t.Being == models.BEING_CAT
}) {
data.IsCat = true
// data.SpeakAsCat = true // TODO: Move to check of separate field in db model
}
if user.Location.Valid {
data.Location = &user.Location.String
}
if user.Birthday.Valid {
data.Birthday = other.IntoPointer(user.Birthday.Time.Format("2006-Jan-02")) //YYYY-Month-DD
}
encoded, err := json.Marshal(data)
w.Header().Add("Content-Type", "application/activity+json")

4
web/public/api/webfinger.go
View file

@ -8,7 +8,7 @@ import (
webutils "git.mstar.dev/mstar/goutils/http"
"git.mstar.dev/mstar/goutils/other"
"github.com/rs/zerolog/hlog"
"github.com/rs/zerolog/log"
"gorm.io/gorm"
"git.mstar.dev/mstar/linstrom/config"
@ -30,7 +30,6 @@ func WellKnownWebfinger(w http.ResponseWriter, r *http.Request) {
Links []OutboundLink `json:"links"`
Aliases []string `json:"aliases,omitempty"`
}
log := hlog.FromRequest(r)
requestedResource := r.FormValue("resource")
matches := webfingerResourceRegex.FindStringSubmatch(requestedResource)
if len(matches) == 0 {
@ -105,7 +104,6 @@ func WellKnownWebfinger(w http.ResponseWriter, r *http.Request) {
func Nodeinfo(w http.ResponseWriter, r *http.Request) {
u := dbgen.User
log := hlog.FromRequest(r)
userCount, err := u.Where(u.DeletedAt.IsNull(), u.Verified.Is(true)).Count()
if err != nil {
webutils.ProblemDetails(w, 500, "/errors/db-failure", "internal database failure", nil, nil)

1
web/public/errorpages.go
View file

@ -11,7 +11,6 @@ var errorDescriptions = map[string]string{
"webfinger-bad-resource": "The given format for the \"resource\" url parameter was missing or invalid. It must follow the form \"acct:<username>@<domain>\"",
"db-failure": "The database query for this request failed for an undisclosed reason. This is often caused by bad input data conflicting with existing information. Try to submit different data or wait for some time",
"bad-request-data": "The data provided in the request doesn't match the requirements, see problem details' detail field for more information",
"bad-page": "The provided page number was not valid. See response details for more information",
}
func errorTypeHandler(w http.ResponseWriter, r *http.Request) {

7
web/public/server.go
View file

@ -57,11 +57,8 @@ func New(addr string, duckImg *string) *Server {
fmt.Fprint(w, *duckImg)
})
server := http.Server{
Handler: webutils.ChainMiddlewares(
handler,
webutils.BuildLoggingMiddleware(map[string]string{"server": "public"}),
),
Addr: addr,
Handler: webutils.ChainMiddlewares(handler, webutils.LoggingMiddleware),
Addr: addr,
}
return &Server{&server}
}

2
web/shared/User.go
View file

@ -19,7 +19,6 @@ type User struct {
CreatedAt time.Time `json:"created_at"`
ServerId uint `json:"server_id"`
Displayname string `json:"displayname"`
Username string `json:"username"`
Description string `json:"description"`
IsBot bool `json:"is_bot"`
IconId *string `json:"icon_id"`
@ -89,7 +88,6 @@ func (u *User) FromModel(m *models.User) {
u.ServerId = m.ServerId
u.Displayname = m.DisplayName
u.IsBot = m.IsBot
u.Username = m.Username
if m.IconId.Valid {
u.IconId = &m.IconId.String
}