adjust path

This commit is contained in:
a 2022-02-21 03:53:13 +00:00
parent e1a3ec1f1d
commit 77d85278a2
170 changed files with 2326 additions and 2305 deletions

View File

@ -10,8 +10,8 @@ import (
"os"
"strconv"
c "github.com/Azareal/Gosora/common"
"github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"gopkg.in/olivere/elastic.v6"
)

View File

@ -1,6 +1,7 @@
//go:build hookgen
// +build hookgen
package main // import "github.com/Azareal/Gosora/hook_gen"
package main // import "git.tuxpa.in/a/gosora/hook_gen"
import (
"fmt"
@ -8,9 +9,9 @@ import (
"runtime/debug"
"strings"
h "github.com/Azareal/Gosora/cmd/common_hook_gen"
c "github.com/Azareal/Gosora/common"
_ "github.com/Azareal/Gosora/extend"
h "git.tuxpa.in/a/gosora/cmd/common_hook_gen"
c "git.tuxpa.in/a/gosora/common"
_ "git.tuxpa.in/a/gosora/extend"
)
// TODO: Make sure all the errors in this file propagate upwards properly

View File

@ -1,12 +1,12 @@
package main // import "github.com/Azareal/Gosora/hook_stub_gen"
package main // import "git.tuxpa.in/a/gosora/hook_stub_gen"
import (
"fmt"
"log"
"strings"
"runtime/debug"
"strings"
h "github.com/Azareal/Gosora/cmd/common_hook_gen"
h "git.tuxpa.in/a/gosora/cmd/common_hook_gen"
)
// TODO: Make sure all the errors in this file propagate upwards properly

View File

@ -15,7 +15,7 @@ import (
"strconv"
"strings"
"github.com/Azareal/Gosora/install"
"git.tuxpa.in/a/gosora/install"
)
var scanner *bufio.Scanner

View File

@ -1,5 +1,5 @@
/* WIP Under Construction */
package main // import "github.com/Azareal/Gosora/query_gen"
package main // import "git.tuxpa.in/a/gosora/query_gen"
import (
"encoding/json"
@ -10,8 +10,8 @@ import (
"strconv"
"strings"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// TODO: Make sure all the errors in this file propagate upwards properly

View File

@ -1,7 +1,10 @@
package main
import "strings"
import "github.com/Azareal/Gosora/query_gen"
import (
"strings"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type PrimaryKeySpitter struct {
keys map[string]string

View File

@ -1,6 +1,6 @@
package main
import qgen "github.com/Azareal/Gosora/query_gen"
import qgen "git.tuxpa.in/a/gosora/query_gen"
var mysqlPre = "utf8mb4"
var mysqlCol = "utf8mb4_general_ci"

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Activity ActivityStream

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var ActivityMatches ActivityStreamMatches

View File

@ -15,8 +15,8 @@ import (
//"fmt"
"github.com/Azareal/Gosora/common/phrases"
qgen "github.com/Azareal/Gosora/query_gen"
"git.tuxpa.in/a/gosora/common/phrases"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type Alert struct {

View File

@ -5,7 +5,7 @@ import (
"log"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Analytics AnalyticsStore

View File

@ -9,7 +9,7 @@ import (
"path/filepath"
"strings"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Attachments AttachmentStore

View File

@ -4,7 +4,7 @@ import (
"database/sql"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var ModLogs LogStore

View File

@ -16,8 +16,8 @@ import (
"strconv"
"strings"
"github.com/Azareal/Gosora/common/gauth"
qgen "github.com/Azareal/Gosora/query_gen"
"git.tuxpa.in/a/gosora/common/gauth"
qgen "git.tuxpa.in/a/gosora/query_gen"
//"golang.org/x/crypto/argon2"
"golang.org/x/crypto/bcrypt"

View File

@ -4,7 +4,7 @@
* Copyright Azareal 2018 - 2020
*
*/
package common // import "github.com/Azareal/Gosora/common"
package common // import "git.tuxpa.in/a/gosora/common"
import (
"database/sql"
@ -19,8 +19,8 @@ import (
"sync/atomic"
"time"
meta "github.com/Azareal/Gosora/common/meta"
qgen "github.com/Azareal/Gosora/query_gen"
meta "git.tuxpa.in/a/gosora/common/meta"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var SoftwareVersion = Version{Major: 0, Minor: 3, Patch: 0, Tag: "dev"}

View File

@ -9,7 +9,7 @@ import (
"database/sql"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Convos ConversationStore

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -6,8 +6,8 @@ import (
"sync"
"time"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -5,8 +5,8 @@ import (
"math"
"time"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -5,8 +5,8 @@ import (
"sync"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -6,9 +6,9 @@ import (
"sync/atomic"
"time"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
"github.com/Azareal/Gosora/uutils"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"git.tuxpa.in/a/gosora/uutils"
"github.com/pkg/errors"
)

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -4,8 +4,8 @@ import (
"database/sql"
"sync/atomic"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -8,8 +8,8 @@ import (
"sync/atomic"
"time"
c "github.com/Azareal/Gosora/common"
qgen "github.com/Azareal/Gosora/query_gen"
c "git.tuxpa.in/a/gosora/common"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -7,7 +7,7 @@ import (
"net/smtp"
"strings"
p "github.com/Azareal/Gosora/common/phrases"
p "git.tuxpa.in/a/gosora/common/phrases"
)
func SendActivationEmail(username, email, token string) error {

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Emails EmailStore

View File

@ -9,7 +9,7 @@ import (
"sync"
"sync/atomic"
p "github.com/Azareal/Gosora/common/phrases"
p "git.tuxpa.in/a/gosora/common/phrases"
)
type ErrorItem struct {

View File

@ -15,7 +15,7 @@ import (
"sync"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var ErrPluginNotInstallable = errors.New("This plugin is not installable")

View File

@ -18,7 +18,7 @@ import (
"strings"
"sync"
tmpl "github.com/Azareal/Gosora/tmpl_client"
tmpl "git.tuxpa.in/a/gosora/tmpl_client"
"github.com/andybalholm/brotli"
)

View File

@ -7,7 +7,7 @@ import (
"strconv"
"strings"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
_ "github.com/go-sql-driver/mysql"
)

View File

@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var ForumActionStore ForumActionStoreInt

View File

@ -4,7 +4,7 @@ import (
"database/sql"
"encoding/json"
"github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// ? - Can we avoid duplicating the items in this list in a bunch of places?

View File

@ -5,7 +5,7 @@ import (
"encoding/json"
"sync"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var FPStore ForumPermsStore

View File

@ -16,7 +16,7 @@ import (
"sync"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var forumCreateMutex sync.Mutex

View File

@ -4,7 +4,7 @@ import (
"database/sql"
"encoding/json"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var blankGroup = Group{ID: 0, Name: ""}

View File

@ -10,7 +10,7 @@ import (
"strconv"
"sync"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Groups GroupStore

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var IPSearch IPSearcher

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Likes LikeStore

View File

@ -5,7 +5,7 @@ import (
"strconv"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Menus *DefaultMenuStore

View File

@ -9,9 +9,9 @@ import (
"strconv"
"strings"
"github.com/Azareal/Gosora/common/phrases"
tmpl "github.com/Azareal/Gosora/common/templates"
qgen "github.com/Azareal/Gosora/query_gen"
"git.tuxpa.in/a/gosora/common/phrases"
tmpl "git.tuxpa.in/a/gosora/common/templates"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type MenuItemList []MenuItem

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// MetaStore is a simple key-value store for the system to stash things in when needed

View File

@ -5,7 +5,7 @@ import (
"errors"
"strings"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var MFAstore MFAStore

View File

@ -4,7 +4,7 @@ import (
"database/sql"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var RegLogs RegLogStore

View File

@ -5,7 +5,7 @@ import (
"strconv"
"strings"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type CustomPageStmts struct {

View File

@ -7,7 +7,7 @@ import (
"sync"
"time"
p "github.com/Azareal/Gosora/common/phrases"
p "git.tuxpa.in/a/gosora/common/phrases"
)
/*type HResource struct {

View File

@ -5,7 +5,7 @@ import (
"database/sql"
"errors"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var PasswordResetter *DefaultPasswordResetter

View File

@ -4,8 +4,8 @@ import (
"encoding/json"
"log"
"github.com/Azareal/Gosora/common/phrases"
qgen "github.com/Azareal/Gosora/query_gen"
"git.tuxpa.in/a/gosora/common/phrases"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// TODO: Refactor the perms system

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var pollStmts PollStmts

View File

@ -7,7 +7,7 @@ import (
"log"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Polls PollStore

View File

@ -6,7 +6,7 @@ import (
"strconv"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var profileReplyStmts ProfileReplyStmts

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Prstore ProfileReplyStore

View File

@ -5,7 +5,7 @@ import (
//"log"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var GroupPromotions GroupPromotionStore

View File

@ -5,7 +5,7 @@ import (
//"log"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Recalc RecalcInt

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var UserBlocks BlockStore

View File

@ -13,7 +13,7 @@ import (
"strconv"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type ReplyUser struct {

View File

@ -4,7 +4,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Rstore ReplyStore

View File

@ -5,7 +5,7 @@ import (
"errors"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// TODO: Make the default report forum ID configurable

View File

@ -12,8 +12,8 @@ import (
"strings"
"time"
"github.com/Azareal/Gosora/common/phrases"
"github.com/Azareal/Gosora/uutils"
"git.tuxpa.in/a/gosora/common/phrases"
"git.tuxpa.in/a/gosora/uutils"
)
// nolint

View File

@ -5,7 +5,7 @@ import (
"errors"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var RepliesSearch Searcher

View File

@ -7,7 +7,7 @@ import (
"strings"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var SettingBox atomic.Value // An atomic value pointing to a SettingBox

View File

@ -3,7 +3,7 @@ package common
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Subscriptions SubscriptionStore

View File

@ -11,7 +11,7 @@ import (
"log"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type TaskStmts struct {

View File

@ -13,11 +13,11 @@ import (
"sync"
"time"
"github.com/Azareal/Gosora/common/alerts"
p "github.com/Azareal/Gosora/common/phrases"
tmpl "github.com/Azareal/Gosora/common/templates"
qgen "github.com/Azareal/Gosora/query_gen"
"github.com/Azareal/Gosora/uutils"
"git.tuxpa.in/a/gosora/common/alerts"
p "git.tuxpa.in/a/gosora/common/phrases"
tmpl "git.tuxpa.in/a/gosora/common/templates"
qgen "git.tuxpa.in/a/gosora/query_gen"
"git.tuxpa.in/a/gosora/uutils"
)
var Ctemplates []string // TODO: Use this to filter out top level templates we don't need
@ -182,7 +182,7 @@ func CompileTemplates() error {
c.SetConfig(config)
c.SetBaseImportMap(map[string]string{
"io": "io",
"github.com/Azareal/Gosora/common": "c github.com/Azareal/Gosora/common",
"git.tuxpa.in/a/gosora/common": "c git.tuxpa.in/a/gosora/common",
})
c.SetBuildTags("!no_templategen")
c.SetOverrideTrack(overriden)
@ -520,7 +520,7 @@ func compileJSTemplates(wg *sync.WaitGroup, c *tmpl.CTemplateSet, themeName stri
c.SetBaseImportMap(map[string]string{
"io": "io",
"github.com/Azareal/Gosora/common/alerts": "github.com/Azareal/Gosora/common/alerts",
"git.tuxpa.in/a/gosora/common/alerts": "git.tuxpa.in/a/gosora/common/alerts",
})
// TODO: Check what sort of path is sent exactly and use it here
@ -532,7 +532,7 @@ func compileJSTemplates(wg *sync.WaitGroup, c *tmpl.CTemplateSet, themeName stri
c.SetBaseImportMap(map[string]string{
"io": "io",
"github.com/Azareal/Gosora/common": "c github.com/Azareal/Gosora/common",
"git.tuxpa.in/a/gosora/common": "c git.tuxpa.in/a/gosora/common",
})
// TODO: Fix the import loop so we don't have to use this hack anymore
c.SetBuildTags("!no_templategen,tmplgentopic")

View File

@ -20,7 +20,7 @@ import (
var textOverlapList = make(map[string]int)
// TODO: Stop hard-coding this here
var langPkg = "github.com/Azareal/Gosora/common/phrases"
var langPkg = "git.tuxpa.in/a/gosora/common/phrases"
type VarItem struct {
Name string
@ -241,7 +241,7 @@ func (c *CTemplateSet) CompileByLoggedin(name, fileDir, expects string, expectsI
}
fname += "_" + c.themeName
}
c.importMap["github.com/Azareal/Gosora/common"] = "c github.com/Azareal/Gosora/common"
c.importMap["git.tuxpa.in/a/gosora/common"] = "c git.tuxpa.in/a/gosora/common"
c.fsb.Reset()
stub = `package ` + c.config.PackageName + "\n" + importList + "\n"
@ -1319,7 +1319,7 @@ ArgLoop:
// TODO: Validate that this is actually a time.Time
//litString("time.Since("+leftParam+").String()", false)
c.importMap["time"] = "time"
c.importMap["github.com/Azareal/Gosora/uutils"] = "github.com/Azareal/Gosora/uutils"
c.importMap["git.tuxpa.in/a/gosora/uutils"] = "git.tuxpa.in/a/gosora/uutils"
litString("time.Duration(uutils.Nanotime() - "+leftParam+").String()", false)
break ArgLoop
case "dock":

View File

@ -21,7 +21,7 @@ import (
"strings"
"text/template"
p "github.com/Azareal/Gosora/common/phrases"
p "git.tuxpa.in/a/gosora/common/phrases"
)
var ErrNoDefaultTheme = errors.New("The default theme isn't registered in the system")

View File

@ -15,7 +15,7 @@ import (
"sync"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// TODO: Something more thread-safe

View File

@ -10,7 +10,7 @@ import (
"golang.org/x/image/tiff"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/pkg/errors"
)

View File

@ -8,8 +8,8 @@ import (
"sync/atomic"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
"github.com/Azareal/Gosora/uutils"
qgen "git.tuxpa.in/a/gosora/query_gen"
"git.tuxpa.in/a/gosora/uutils"
"github.com/pkg/errors"
)

View File

@ -17,8 +17,8 @@ import (
//"log"
p "github.com/Azareal/Gosora/common/phrases"
qgen "github.com/Azareal/Gosora/query_gen"
p "git.tuxpa.in/a/gosora/common/phrases"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// This is also in reply.go

View File

@ -7,7 +7,7 @@ import (
"sync"
"time"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var TopicList TopicListInt

View File

@ -12,7 +12,7 @@ import (
"strconv"
"strings"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// TODO: Add the watchdog goroutine

View File

@ -15,7 +15,7 @@ import (
//"log"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
"github.com/go-sql-driver/mysql"
)

View File

@ -5,7 +5,7 @@ import (
"errors"
"strconv"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
"golang.org/x/crypto/bcrypt"
)

View File

@ -1,3 +1,4 @@
//go:build !no_ws
// +build !no_ws
/*
@ -19,7 +20,7 @@ import (
"sync"
"time"
p "github.com/Azareal/Gosora/common/phrases"
p "git.tuxpa.in/a/gosora/common/phrases"
"github.com/Azareal/gopsutil/cpu"
"github.com/Azareal/gopsutil/mem"
"github.com/gorilla/websocket"

View File

@ -7,7 +7,7 @@ import (
"strings"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
type WidgetStmts struct {

View File

@ -5,8 +5,8 @@ import (
//"log"
"net/http/httptest"
p "github.com/Azareal/Gosora/common/phrases"
min "github.com/Azareal/Gosora/common/templates"
p "git.tuxpa.in/a/gosora/common/phrases"
min "git.tuxpa.in/a/gosora/common/templates"
)
type wolUsers struct {

View File

@ -1,6 +1,6 @@
package common
import "github.com/Azareal/Gosora/common/phrases"
import "git.tuxpa.in/a/gosora/common/phrases"
func wolContextRender(widget *Widget, hvars interface{}) (string, error) {
header := hvars.(*Header)

View File

@ -10,8 +10,8 @@ import (
"sync"
"sync/atomic"
min "github.com/Azareal/Gosora/common/templates"
"github.com/Azareal/Gosora/uutils"
min "git.tuxpa.in/a/gosora/common/templates"
"git.tuxpa.in/a/gosora/uutils"
"github.com/pkg/errors"
)

View File

@ -4,7 +4,7 @@ import (
"database/sql"
"sync/atomic"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
// TODO: Move some features into methods on this?

View File

@ -4,7 +4,7 @@ import (
"database/sql"
"log"
c "github.com/Azareal/Gosora/common"
c "git.tuxpa.in/a/gosora/common"
"github.com/pkg/errors"
)

View File

@ -14,9 +14,9 @@ Dev is for a few flags which help out with the development of Gosora.
Plugin which you may not have run into is a category in which plugins can define their own custom configuration settings.
An example of what the file might look like: https://github.com/Azareal/Gosora/blob/master/config/config_example.json
An example of what the file might look like: https://git.tuxpa.in/a/gosora/blob/master/config/config_example.json
Other configuration files: [config/weakpass.json](https://github.com/Azareal/Gosora/blob/master/docs/weak_passwords.md), [config/emoji.json](https://github.com/Azareal/Gosora/blob/master/docs/emoji.md) (WIP)
Other configuration files: [config/weakpass.json](https://git.tuxpa.in/a/gosora/blob/master/docs/weak_passwords.md), [config/emoji.json](https://git.tuxpa.in/a/gosora/blob/master/docs/emoji.md) (WIP)
# Site
@ -36,7 +36,7 @@ EnableEmails - Determines whether the SMTP mail subsystem is enabled. The experi
HasProxy - Brittle, but lets you set whether you're sitting behind a proxy like Cloudflare. Unknown effects with reverse-proxies like Nginx.
Language - The language you want to use. Defaults to english. Please consult [internationalisation](https://github.com/Azareal/Gosora/blob/master/docs/internationalisation.md) for details.
Language - The language you want to use. Defaults to english. Please consult [internationalisation](https://git.tuxpa.in/a/gosora/blob/master/docs/internationalisation.md) for details.
# Config

View File

@ -17,7 +17,7 @@ First, we need somewhere for the software to live, if you're familiar with Linux
First, we'll navigate to our home folder by typing: `cd ~`
And then, we'll going to pull a copy of Gosora off the git server with: `git clone https://github.com/Azareal/Gosora gosora`
And then, we'll going to pull a copy of Gosora off the git server with: `git clone https://git.tuxpa.in/a/gosora gosora`
We can now hop into the newly created folder with the same command we used for getting to the home folder:
@ -63,7 +63,7 @@ mkdir gosora
cd gosora
git clone https://github.com/Azareal/Gosora src
git clone https://git.tuxpa.in/a/gosora src
chown -R gosora ../gosora
@ -99,7 +99,7 @@ We will also want to setup a service:
# Additional Configuration
For things like HTTPS, you might also need to [modify your config.json](https://github.com/Azareal/Gosora/blob/master/docs/configuration.md) file after installing Gosora to get it working.
For things like HTTPS, you might also need to [modify your config.json](https://git.tuxpa.in/a/gosora/blob/master/docs/configuration.md) file after installing Gosora to get it working.
You can get a free private key and certificate pair from Let's Encrypt or Cloudflare.
@ -125,7 +125,7 @@ For more info, you might want to take a gander inside the `./run-linux` and `./i
Linux:
```bash
git clone https://github.com/Azareal/Gosora gosora
git clone https://git.tuxpa.in/a/gosora gosora
cd gosora
@ -181,7 +181,7 @@ easyjson -pkg common
Windows:
```batch
git clone https://github.com/Azareal/Gosora gosora
git clone https://git.tuxpa.in/a/gosora gosora
cd gosora

View File

@ -2,7 +2,7 @@
The update system is currently under development, but you can run `dev-update.bat` to update your instance to the latest commit and to update the associated database schema, etc.
If you run into any issues doing so, please open an issue: https://github.com/Azareal/Gosora/issues/new
If you run into any issues doing so, please open an issue: https://git.tuxpa.in/a/gosora/issues/new
If you want to manually patch Gosora rather than relying on the above scripts to do it, you'll first want to save your changes with `git stash`, and then, you'll overwrite the files with the new ones with `git pull origin master`, and then, you can re-apply your custom changes with `git stash apply`
@ -14,7 +14,7 @@ Once you've done that, you just need to run `patcher.exe` to apply the latest pa
The update system is currently under development, but you can run `dev-update-linux` to update your instance to the latest commit and to update the associated database schema, etc.
If you run into any issues doing so, please open an issue: https://github.com/Azareal/Gosora/issues/new
If you run into any issues doing so, please open an issue: https://git.tuxpa.in/a/gosora/issues/new
If you want to manually patch Gosora rather than relying on the above scripts to do it, you'll first want to save your changes with `git stash`, and then, you'll overwrite the files with the new ones with `git pull origin master`, and then, you'll re-apply your changes with `git stash apply`.
@ -29,7 +29,7 @@ You will first want to follow the instructions in the section for updating depen
The update system is currently under development, but you can run `quick-update-linux` in `/home/gosora/src`to update your instance to the latest commit and to update the associated database schema, etc.
If you run into any issues doing so, please open an issue: https://github.com/Azareal/Gosora/issues/new
If you run into any issues doing so, please open an issue: https://git.tuxpa.in/a/gosora/issues/new
If you're using a systemd service, then you might want to switch to the `gosora` user with `su gosora` (you may be prompted for the password to the user), you can switch back by typing `exit`.
If this is the first time you've done an update as the `gosora` user, then you might have to configure Git, simply do:

View File

@ -1,9 +1,11 @@
package main
import c "github.com/Azareal/Gosora/common"
import "github.com/oschwald/geoip2-golang"
import (
c "git.tuxpa.in/a/gosora/common"
"github.com/oschwald/geoip2-golang"
)
var geoipDB *geoip.DB
var geoipDB *geoip2.Reader
var geoipDBLocation = "geoip_db.mmdb"
func init() {

View File

@ -6,7 +6,7 @@ import (
"os/exec"
"runtime"
c "github.com/Azareal/Gosora/common"
c "git.tuxpa.in/a/gosora/common"
)
/*

View File

@ -2,6 +2,6 @@
"UName":"adventure",
"Name":"Adventure",
"Author":"Azareal",
"URL":"https://github.com/Azareal/Gosora",
"URL":"https://git.tuxpa.in/a/gosora",
"Skip":true
}

View File

@ -3,7 +3,7 @@ package guilds
import (
"database/sql"
qgen "github.com/Azareal/Gosora/query_gen"
qgen "git.tuxpa.in/a/gosora/query_gen"
)
var Gstore GuildStore

View File

@ -1,4 +1,4 @@
package guilds // import "github.com/Azareal/Gosora/extend/guilds/lib"
package guilds // import "git.tuxpa.in/a/gosora/extend/guilds/lib"
import (
"bytes"
@ -10,8 +10,8 @@ import (
"strconv"
"strings"
c "github.com/Azareal/Gosora/common"
"github.com/Azareal/Gosora/routes"
c "git.tuxpa.in/a/gosora/common"
"git.tuxpa.in/a/gosora/routes"
)
// A blank list to fill out that parameter in Page for routes which don't use it
@ -62,6 +62,7 @@ type Page struct {
// ListPage is a page struct for constructing a list of every guild
type ListPage struct {
Title string
User *c.User
Header *c.Header
GuildList []*Guild
}

View File

@ -2,6 +2,6 @@
"UName":"guilds",
"Name":"Guilds",
"Author":"Azareal",
"URL":"https://github.com/Azareal/Gosora",
"URL":"https://git.tuxpa.in/a/gosora",
"Skip":true
}

View File

@ -1,8 +1,8 @@
package main
import (
c "github.com/Azareal/Gosora/common"
guilds "github.com/Azareal/Gosora/extend/guilds/lib"
c "git.tuxpa.in/a/gosora/common"
guilds "git.tuxpa.in/a/gosora/extend/guilds/lib"
)
// TODO: Add a better way of splitting up giant plugins like this

View File

@ -2,6 +2,6 @@
"UName":"heytherejs",
"Name":"HeythereJS",
"Author":"Azareal",
"URL":"https://github.com/Azareal/Gosora",
"URL":"https://git.tuxpa.in/a/gosora",
"Main":"main.js"
}

View File

@ -1,7 +1,7 @@
// WIP - Experimental adventure plugin, this might find a new home soon, but it's here to stress test Gosora's extensibility for now
package extend
import c "github.com/Azareal/Gosora/common"
import c "git.tuxpa.in/a/gosora/common"
func init() {
c.Plugins.Add(&c.Plugin{

View File

@ -7,7 +7,7 @@ import (
"strconv"
"time"
c "github.com/Azareal/Gosora/common"
c "git.tuxpa.in/a/gosora/common"
)
var bbcodeRandom *rand.Rand

View File

@ -1,6 +1,6 @@
package extend
import c "github.com/Azareal/Gosora/common"
import c "git.tuxpa.in/a/gosora/common"
func init() {
c.Plugins.Add(&c.Plugin{UName: "heythere", Name: "Hey There", Author: "Azareal", URL: "https://github.com/Azareal", Init: initHeythere, Deactivate: deactivateHeythere})

View File

@ -12,8 +12,8 @@ import (
"sync/atomic"
"time"
c "github.com/Azareal/Gosora/common"
"github.com/Azareal/Gosora/routes"
c "git.tuxpa.in/a/gosora/common"
"git.tuxpa.in/a/gosora/routes"
)
var hyperspace *Hyperspace

View File

@ -3,7 +3,7 @@ package extend
import (
"strings"
c "github.com/Azareal/Gosora/common"
c "git.tuxpa.in/a/gosora/common"
)
var markdownMaxDepth = 25 // How deep the parser will go when parsing Markdown strings

Some files were not shown because too many files have changed in this diff Show More