Merge branch 'master' of gitler.moe:suwako/spliti

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.2.0
+* GNU MakeからBSD Makeに変更
+* 社会、トレンド、地域、海外、コラム、及びライフスタイルのカテゴリページの修正
+* マウスオーバーのハイライトの追加
+* .pageList02のスタイリングの追加
+
 # 2.1.0
 * 出版社ページを追加
 * 出版社ページのページネーション

Makefile

@@ -1,10 +1,10 @@
-NAME := $(shell cat main.go | grep "var sofname" | awk '{print $$4}' | sed "s/\"//g")
-VERSION := $(shell cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g")
+NAME!=cat main.go | grep "var sofname" | awk '{print $$4}' | sed "s/\"//g"
+VERSION!=cat main.go | grep "var version" | awk '{print $$4}' | sed "s/\"//g"
 # Linux、Haiku、Illumos = /usr、FreeBSDとOpenBSD = /usr/local、NetBSD = /usr/pkg
 PREFIX=/usr/local
 MANPREFIX=${PREFIX}/share/man
-# FreeBSD = /usr/local/etc、それ以外 = /etc
-CNFPREFIX=/etc
+# FreeBSD = /usr/local/etc、NetBSD = /usr/pkg/etc、それ以外 = /etc
+CNFPREFIX?=/etc
 CC=CGO_ENABLED=0 go build
 # リリース。なし＝デバッグ。
 RELEASE=-ldflags="-s -w" -buildvcs=false
@@ -48,7 +48,7 @@ dist: clean
 	rm -rf ${NAME}-${VERSION}
 
 config:
-	make -p ${DESTDIR}${CNFPREFIX}/spliti
+	mkdir -p ${DESTDIR}${CNFPREFIX}/spliti
 	cp config.json ${DESTDIR}${CNFPREFIX}/spliti
 
 install: all

README.md

@@ -13,12 +13,27 @@ git clone https://gitler.moe/suwako/spliti.git && cd spliti
 find . -type f -name "config.json" -exec sed -i 's/mixi.076.moe/$domain/g'
 ```
 
-### Linux
+### OpenBSD（オススメ）
 
 ```sh
 make
-doas make install PREFIX=/usr
+doas make install
 doas make config
+cd /etc
+wget https://076.moe/repo/webserver/relayd/spliti.conf
+mv spliti.conf relayd.conf
+find . -type f -name "/etc/relayd.conf" -exec sed -i 's/DOMAIN/$domain/g'
+rcctl restart relayd
+```
+
+### Linux
+
+**注意：BSD Makeをインストールして下さい。GNU Makeは未対応です。**
+
+```sh
+bmake
+doas bmake install PREFIX=/usr
+doas bmake config
 cp /etc/nginx/sites-enabled
 wget https://076.moe/repo/webserver/nginx/spliti.conf
 find . -type f -name "/etc/nginx/sites-enabled/spliti.conf" -exec sed -i 's/DOMAIN/$domain/g'
@@ -37,17 +52,16 @@ find . -type f -name "/usr/local/etc/nginx/sites-enabled/spliti.conf" -exec sed
 service nginx restart
 ```
 
-### OpenBSD
+### NetBSD
 
 ```sh
 make
 doas make install
-doas make config
-cd /etc
-wget https://076.moe/repo/webserver/relayd/spliti.conf
-mv spliti.conf relayd.conf
-find . -type f -name "/etc/relayd.conf" -exec sed -i 's/DOMAIN/$domain/g'
-rcctl restart relayd
+doas make config CNFPREFIX=/usr/pkg/etc
+cp srv/nginx.conf /usr/pkg/etc/nginx/sites-enabled/spliti.conf
+wget https://076.moe/repo/webserver/nginx/spliti.conf
+find . -type f -name "/usr/pkg/etc/nginx/sites-enabled/spliti.conf" -exec sed -i 's/DOMAIN/$domain/g'
+service nginx restart
 ```
 
 ## インスタンス一覧

lib.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-  "io/ioutil"
+  "io"
   "strings"
   "bytes"
 
@@ -35,7 +35,7 @@ func strip_tags(data string) string {
 func EUCJPToUTF8(input []byte) (string, error) {
   transformer := japanese.EUCJP.NewDecoder()
   reader := transform.NewReader(bytes.NewReader(input), transformer)
-  result, err := ioutil.ReadAll(reader)
+  result, err := io.ReadAll(reader)
   if err != nil {
     return "エンコーディングに失敗", err
   }

main.go

@@ -7,9 +7,12 @@ import (
 )
 
 var sofname = "spliti"
-var version = "2.1.0"
+var version = "2.2.0"
 
 func help() {
+  fmt.Println("０７６ " + sofname + "-" + version + " - mixi向けプライバシーUI")
+  fmt.Println("https://mixi.076.moe/ | https://gitler.moe/suwako/spliti")
+  fmt.Println("")
   fmt.Println("使い方：")
   fmt.Println(sofname + " -v               ：バージョンを表示")
   fmt.Println(sofname + " -s [ポート番号]　：ポート番号でウエブサーバーを実行（デフォルト＝9930）")

page.go

@@ -2,7 +2,7 @@ package main
 
 import (
   "fmt"
-  "io/ioutil"
+  "io"
   "net/http"
   "regexp"
   "strings"
@@ -63,7 +63,7 @@ func get(url string, cnf Config) map[string]string {
   defer resp.Body.Close()
 
   if resp.StatusCode == http.StatusOK {
-    bytebody, err := ioutil.ReadAll(resp.Body)
+    bytebody, err := io.ReadAll(resp.Body)
     if err != nil {
       res["err"] = "内容はバイトコードとして読み込みに失敗。"
       fmt.Println(res["err"])
@@ -90,7 +90,7 @@ func get(url string, cnf Config) map[string]string {
     } else if ispublish(url) {
       res["content"] = rmpbloat(body, cnf)
     } else if issubcat(url) {
-      if !strings.Contains(body, "subCategoryNavi") {
+      if strings.Contains(body, `<p class="messageAlert">存在しないカテゴリです</p>`) {
         res["content"] = rmebloat(body, cnf)
       } else {
         res["content"] = rmsbloat(body, cnf)

static/style.css

@@ -112,7 +112,10 @@ p.reactions {
   background: #3c213c;
 }
 
-.LEGACY_UI2016_subCategoryNavi > p > a, .pageList01 > div > ul > li, .pageList01 > ul > li, .pageNavigation02 > p.first, .pageNavigation02 > p.last, ul.sortTab > li {
+.LEGACY_UI2016_subCategoryNavi > p > a, .pageList01 > div > ul > li,
+.pageList01 > ul > li, .pageNavigation02 > p.first,
+.pageNavigation02 > p.last, ul.sortTab > li,
+.pageList02 > ul > li {
   background-color: #4d4d4d;
   padding: 4px;
   border: 1px solid #c625ef;
@@ -120,23 +123,42 @@ p.reactions {
   text-decoration: none;
 }
 
-.pageNavigation02 > p, .pageList01 > ul > li {
+.pageList01 > div > ul > li:not([class]):hover,
+.pageList01 > ul > li:hover,
+ul.sortTab > li:hover,
+.pageList02 > ul > li[rel="__prev"]:hover,
+.pageList02 > ul > li[rel="__next"]:hover,
+li.NEWS_pickupNewsItem:hover,
+p.NEWS_pickupItems__moreLink:hover,
+li.newCategoryList > a:hover,
+.photoNewsArea > a:hover,
+.NEWS_photoNewsItems__contentsArea:hover,
+a.tubuyaki-btn:hover,
+p.first:hover, p.last:hover,
+tr.odd:hover, tr.even:hover, .totop:hover {
+  background-color: #ae6bdb;
+}
+
+.pageNavigation02 > p, .pageList01 > ul > li, .pageList02 > ul > li {
   padding: 8px !important;
 }
 
-.pageNavigation02 > p.none, .pageList01 > ul > li.on, ul.sortTab > li.current, ul.sortTab > li.current > a {
+.pageNavigation02 > p.none, .pageList01 > ul > li.on, ul.sortTab > li.current,
+ul.sortTab > li.current > a {
   background-color: #232629;
   color: #4d4d4d;
   border-color: #4d4d4d;
 }
 
-.pageList01 > div > ul, .pageList01 > ul, .pageNavigation02 > p.first, .pageNavigation02 > p.last, ul.sortTab {
+.pageList01 > div > ul, .pageList01 > ul, .pageNavigation02 > p.first,
+.pageNavigation02 > p.last, ul.sortTab, .pageList02 > ul > li {
   padding-left: unset;
 }
 
 .pageList01 > div > ul,
 .pageList01 > div > ul > li,
 .pageList01 > ul > li,
+.pageList02 > ul > li,
 .entryList01, .entryList01 > li,
 .NEWS_pickupNewsList,
 .pageNavigation02 > p.first,
@@ -148,10 +170,20 @@ h2.newsTitle {
   display: inline;
 }
 
+.pageList02 {
+  text-align: center;
+  padding-top: 8px;
+}
+
 .relationNewsDescription {
   margin-top: 18px;
 }
 
+.relationNewsDescription > p.date {
+  border-left: 3px solid #f976de;
+  padding: 0 0 0 8px;
+}
+
 ul.voiceList01 {
   padding-left: 0;
 }