mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-02 19:59:08 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
4914899cad
@ -297,7 +297,7 @@ func refreshAnnouncement() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, announcement := range GetAnnouncements() {
|
for _, announcement := range getAnnouncements() {
|
||||||
var exist bool
|
var exist bool
|
||||||
for _, existingAnnouncement := range existingAnnouncements {
|
for _, existingAnnouncement := range existingAnnouncements {
|
||||||
if announcement.Id == existingAnnouncement.Id {
|
if announcement.Id == existingAnnouncement.Id {
|
||||||
|
@ -233,7 +233,7 @@ type Announcement struct {
|
|||||||
Region int `json:"region"`
|
Region int `json:"region"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetAnnouncements() (ret []*Announcement) {
|
func getAnnouncements() (ret []*Announcement) {
|
||||||
result, err := util.GetRhyResult(false)
|
result, err := util.GetRhyResult(false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logging.LogErrorf("get announcement failed: %s", err)
|
logging.LogErrorf("get announcement failed: %s", err)
|
||||||
|
Loading…
Reference in New Issue
Block a user