Fixed this horrendous

Author: dark-steveneq

.gitignore

@@ -19,3 +19,6 @@
 
 # Go workspace file
 go.work
+
+.vscode
+go.sum

README.md

@@ -1,3 +1,8 @@
 # MobiAPI
 WIP scraping library for Polish e-register [mobiDziennik](https://mobidziennik.pl) made in Go
-If you want to see example usage if this library, check out my scuffed desktop client, [mobiNG](https://github.com/dark-steveneq/mobing)
+
+# Examples
+Check out [examples/](https://github.com/dark-steveneq/blob/main/examples/) folder for individual examples, however if you want to see reference implementation, check out my abomination of a desktop app - [mobiNG](https://github.com/dark-steveneq/mobing) (hehe funny name). 
+
+# Development
+For developing MobiAPI you'll first of all need access to mobiDziennik, a web browser and a basic understanding of Go and probably how various web technologies work and a proxy for intercepting network trafic. I can recommend [ZAP](https://zaproxy.org) since it's what I've been using but it's cross-platform and open source but you can use anything. `MobiAPI` type already has a function for connecting to a proxy server you can use.

auth.go

@@ -4,16 +4,28 @@ import (
 	"errors"
 	"net/http"
 	"net/url"
+	"strconv"
+
+	"github.com/PuerkitoBio/goquery"
 )
 
+func (api *MobiAPI) postlogin(doc *goquery.Document) {
+	if val, exists := doc.Find("body").Attr("uid"); exists {
+		api.uid, _ = strconv.Atoi(val)
+		api.name = doc.Find("#botton div strong").Text()
+	}
+}
+
 // Authenticate with password.
 func (api *MobiAPI) PasswordAuth(login, password string) (bool, error) {
-	resp, _, err := api.request("POST", "logowanie", "login="+login+"&haslo="+password)
+	resp, doc, err := api.request("POST", "logowanie", "login="+login+"&haslo="+password)
 	if err != nil {
 		return false, err
 	}
 
 	if resp.Request.Response.StatusCode == 302 {
+		api.signedin = true
+		api.postlogin(doc)
 		return true, nil
 	}
 
@@ -40,7 +52,7 @@ func (api *MobiAPI) TokenAuth(token string) (bool, error) {
 		}
 	}
 
-	resp, _, err := api.request("GET", "logowanie", "")
+	resp, doc, err := api.request("GET", "logowanie", "")
 	if err != nil {
 		return false, err
 	}
@@ -49,6 +61,7 @@ func (api *MobiAPI) TokenAuth(token string) (bool, error) {
 		return false, errors.New("AuthUnable")
 	} else if resp.Request.Response.StatusCode == 302 {
 		api.signedin = true
+		api.postlogin(doc)
 		return true, nil
 	}
 
@@ -65,3 +78,9 @@ func (api *MobiAPI) LoggedIn(noprecache bool) bool {
 	}
 	return api.signedin
 }
+
+// Does a random request to extend session
+func (api *MobiAPI) ExtendSession() error {
+	_, _, err := api.request("POST", "", "")
+	return err
+}

examples/token-extender/main.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/dark-steveneq/mobiapi"
+)
+
+/*
+"Token" in this context is a value from a uniquely named cookie.
+Each domain uses a different name, so make sure not to include it
+if you don't want to dox yourself.
+*/
+func main() {
+	if len(os.Args) != 3 {
+		fmt.Printf("Usage: %s <domain> <token>\n", os.Args[0])
+		os.Exit(1)
+	}
+
+	api, err := mobiapi.New(os.Args[1])
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	signedin, err := api.TokenAuth(os.Args[2])
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	} else if !signedin {
+		fmt.Println("Couldn't sign in!")
+	}
+
+	for {
+		time.Sleep(5 * time.Minute)
+		if err := api.ExtendSession(); err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+	}
+}

examples/unread-messages/main.go

@@ -0,0 +1,67 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/dark-steveneq/mobiapi"
+)
+
+func main() {
+	if len(os.Args) != 4 {
+		fmt.Printf("Usage: %s <domain> <login> <package>\n", os.Args[0])
+		os.Exit(1)
+	}
+	reader := bufio.NewReader(os.Stdin)
+
+	api, err := mobiapi.New(os.Args[1])
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	signedin, err := api.PasswordAuth(os.Args[2], os.Args[3])
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	} else if !signedin {
+		fmt.Println("Couldn't log in!")
+		os.Exit(1)
+	}
+	defer api.Logout()
+
+	messages, err := api.GetReceivedMessages(false)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	unread := map[int]mobiapi.MessageInfo{}
+	for _, message := range messages {
+		if message.Read == true {
+			unread[len(unread)] = message
+		}
+	}
+
+	fmt.Printf("Hello, %s!\nYou Have %d unread messages. Do you want to read them one by one? [Y/n]\n", api.GetName(), len(unread))
+	text, _ := reader.ReadString('\n')
+	text = strings.ToLower(text)
+	if text == "n" || text == "no" {
+		fmt.Println("Okeh.")
+		os.Exit(0)
+	}
+	for _, message := range unread {
+		messagecontent, err := api.GetMessageContent(message)
+		if err != nil {
+			fmt.Println("Couldn't read message!")
+		} else {
+			fmt.Printf("Title: %s\nFrom: %s\nRead: %t\n'''\n%s\n'''\nDownloads: %d", message.Title, message.Author, message.Read, messagecontent.Content, len(messagecontent.Downloads))
+			fmt.Printf("\n")
+			for name := range messagecontent.Downloads {
+				fmt.Printf("- %s\n", name)
+			}
+		}
+		reader.ReadString('\n')
+	}
+}

message.go

@@ -8,8 +8,13 @@ import (
 	"github.com/PuerkitoBio/goquery"
 )
 
+const (
+	MessageSent     = 1
+	MessageReceived = 2
+)
+
 type MessageInfo struct {
-	Kind   string
+	Kind   int
 	Title  string
 	Author string
 	ID     int
@@ -24,7 +29,7 @@ type MessageContent struct {
 }
 
 // Scrapes and returns message IDs and titles from first or every subsequent page in the form of MessageInfo. Use GetMessageContent() with MessageInfo to read it.
-func (api *MobiAPI) GetReadMessages(firstpage bool) ([]MessageInfo, error) {
+func (api *MobiAPI) GetReceivedMessages(firstpage bool) ([]MessageInfo, error) {
 	pages := 1
 	messages := []MessageInfo{}
 	for i := 1; i <= pages; i++ {
@@ -37,7 +42,41 @@ func (api *MobiAPI) GetReadMessages(firstpage bool) ([]MessageInfo, error) {
 			pages = doc.Find(".stronnicowanie").Children().Length()
 		}
 		doc.Find(".podswietl").Each(func(mi int, s *goquery.Selection) {
-			message := MessageInfo{Read: s.Find("td span").HasClass("wiadomosc_przeczytana")}
+			message := MessageInfo{Read: s.Find("td span").HasClass("wiadomosc_przeczytana"), Kind: MessageReceived}
+			sid, _ := s.Attr("rel")
+			iid, _ := strconv.Atoi(sid)
+			message.ID = iid
+			html, _ := s.Children().Html()
+			message.Title = strings.TrimSpace(html)
+			s.Children().First().Remove()
+			s.Children().First().Remove()
+			s.Children().First().Remove()
+			html, _ = s.Children().Html()
+			message.Author = strings.ReplaceAll(strings.ReplaceAll(html, "<small>", ""), "</small>", "")
+			messages = append(messages, message)
+		})
+	}
+	if len(messages) > 0 {
+		return messages, nil
+	}
+	return nil, errors.New("Unprocessed")
+}
+
+// Scrapes and returns message IDs and titles from first or every subsequent page in the form of MessageInfo. Use GetMessageContent() with MessageInfo to read it.
+func (api *MobiAPI) GetSentMessages(firstpage bool) ([]MessageInfo, error) {
+	pages := 1
+	messages := []MessageInfo{}
+	for i := 1; i <= pages; i++ {
+		resp, doc, err := api.request("GET", "wiadomosci/?sortuj_wg=wysłane&sortuj_typ=desc&wysłane="+strconv.Itoa(i), "")
+		if err != nil {
+			return nil, err
+		}
+		defer resp.Body.Close()
+		if !firstpage && i == 1 {
+			pages = doc.Find(".stronnicowanie").Children().Length()
+		}
+		doc.Find(".podswietl").Each(func(mi int, s *goquery.Selection) {
+			message := MessageInfo{Kind: MessageSent}
 			sid, _ := s.Attr("rel")
 			iid, _ := strconv.Atoi(sid)
 			message.ID = iid
@@ -59,21 +98,26 @@ func (api *MobiAPI) GetReadMessages(firstpage bool) ([]MessageInfo, error) {
 
 // Searches messages using MobiDziennik's built-in search feature.
 func (api *MobiAPI) SearchMessages(phrase string) ([]MessageInfo, error) {
-	resp, doc, err := api.request("GET", "dziennik/wyszukiwarkawiadomosci?q="+phrase, "")
+	resp, doc, err := api.request("GET", "wyszukiwarkawiadomosci?q="+phrase, "")
 	if err != nil {
 		return nil, err
 	}
 	defer resp.Body.Close()
 
 	messages := []MessageInfo{}
 	doc.Find(".podswietl").Each(func(i int, s *goquery.Selection) {
-		if attr, exists := s.Attr("rel"); exists && strings.Contains(attr, "wiadodebrana") {
-			id, _ := strconv.Atoi(strings.ReplaceAll(attr, "wiadodebrana?id=", ""))
+		if attr, exists := s.Attr("rel"); exists {
+			kind := MessageSent
+			if strings.Contains(attr, "wiadodebrana") {
+				kind = MessageReceived
+			}
+			id, _ := strconv.Atoi(strings.ReplaceAll(strings.ReplaceAll(attr, "wiadwyslana?id=", ""), "wiadodebrana?id=", ""))
 			messages = append(messages, MessageInfo{
 				Title:  s.Find("td div.ellipsis").Text(),
 				Author: s.Find("td div.autoTooltip").Text(),
 				ID:     id,
 				Read:   false,
+				Kind:   kind,
 			})
 		}
 	})
@@ -87,7 +131,8 @@ func (api *MobiAPI) SearchMessages(phrase string) ([]MessageInfo, error) {
 // Read Received Message from MessageInfo into MessageContent.
 func (api *MobiAPI) GetMessageContent(message MessageInfo) (MessageContent, error) {
 	messagecontent := MessageContent{Info: message}
-	resp, doc, err := api.request("GET", "dziennik/wiadodebrana/?id="+strconv.Itoa(message.ID), "")
+
+	resp, doc, err := api.request("GET", "wiadodebrana/?id="+strconv.Itoa(message.ID), "")
 	if err != nil {
 		return messagecontent, err
 	}
@@ -100,7 +145,7 @@ func (api *MobiAPI) GetMessageContent(message MessageInfo) (MessageContent, erro
 	if err != nil {
 		return messagecontent, err
 	}
-	messagecontent.Content = strings.ReplaceAll(strings.ReplaceAll(contents.Text(), "<p>", ""), "</p>", "\n")
+	messagecontent.Content = contents.Text()
 
 	if doc.Find("#zalaczniki").Length() == 1 {
 		messagecontent.Downloads = map[string]string{}