gisle/irc
1
0
Fork 0
mirror of https://github.com/gissleh/irc.git synced 2026-09-29 00:05:34 +00:00
Code Issues Releases Wiki Activity

Cleaned up event targetting, changed Event.MarshalJSON, added Event.RenderTags

Browse Source
This commit is contained in:
gisle
2018-06-27 08:59:48 +02:00
parent 6377349c28
commit c17a5e59bc
2 changed files with 104 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client.go
+61 -15
View File
@@ -476,6 +476,28 @@ func (client *Client) RemoveTarget(target Target) (id string, err error) {
return
}
// FindUser checks each channel to find user info about a user.
func (client *Client) FindUser(nick string) (u list.User, ok bool) {
client.mutex.RLock()
defer client.mutex.RUnlock()
for _, target := range client.targets {
channel, ok := target.(*Channel)
if !ok {
continue
}
user, ok := channel.UserList().User(nick)
if !ok {
continue
}
return user, true
}
return list.User{}, false
}
func (client *Client) handleEventLoop() {
ticker := time.NewTicker(time.Second * 30)
@@ -814,7 +836,7 @@ func (client *Client) handleEvent(event *Event) {
channel = client.Channel(event.Arg(0))
}
event.targets = append(event.targets, channel)
client.handleInTarget(channel, event)
if channel != nil {
channel.Handle(event, client)
@@ -833,7 +855,7 @@ func (client *Client) handleEvent(event *Event) {
if event.Nick == client.nick {
client.RemoveTarget(channel)
} else {
event.targets = append(event.targets, channel)
client.handleInTarget(channel, event)
}
}
@@ -846,7 +868,7 @@ func (client *Client) handleEvent(event *Event) {
{
channel := client.Channel(event.Arg(2))
if channel != nil {
channel.Handle(event, client)
client.handleInTarget(channel, event)
}
}
@@ -854,7 +876,7 @@ func (client *Client) handleEvent(event *Event) {
{
channel := client.Channel(event.Arg(1))
if channel != nil {
channel.Handle(event, client)
client.handleInTarget(channel, event)
}
}
@@ -865,7 +887,7 @@ func (client *Client) handleEvent(event *Event) {
if client.isupport.IsChannel(targetName) {
channel := client.Channel(targetName)
if channel != nil {
channel.Handle(event, client)
client.handleInTarget(channel, event)
}
}
}
@@ -893,14 +915,19 @@ func (client *Client) handleEvent(event *Event) {
target = query
}
} else {
target = client.Channel(targetName)
if target == nil {
channel := client.Channel(targetName)
if channel != nil {
if user, ok := channel.UserList().User(event.Nick); ok {
event.RenderTags["prefixedNick"] = user.PrefixedNick
}
target = channel
} else {
target = client.status
}
}
target.Handle(event, client)
event.targets = append(event.targets, target)
client.handleInTarget(target, event)
if spawned {
// TODO: Message has higher importance // 0:Normal, 1:Important, 2:Highlight
@@ -917,8 +944,11 @@ func (client *Client) handleEvent(event *Event) {
continue
}
channel.Handle(event, client)
event.targets = append(event.targets, channel)
if user, ok := channel.UserList().User(event.Nick); ok {
event.RenderTags["prefixedNick"] = user.PrefixedNick
}
client.handleInTarget(channel, event)
break
}
}
@@ -926,7 +956,7 @@ func (client *Client) handleEvent(event *Event) {
// Otherwise, it belongs in the status target
if len(event.targets) == 0 {
client.status.Handle(event, client)
event.targets = append(event.targets, client.status)
client.handleInTarget(client.status, event)
}
}
@@ -944,7 +974,7 @@ func (client *Client) handleEvent(event *Event) {
}
if len(event.targets) == 0 {
event.targets = append(event.targets, client.status)
client.handleInTarget(client.status, event)
}
}
@@ -960,22 +990,27 @@ func (client *Client) handleInTargets(nick string, event *Event) {
}
}
event.targets = append(event.targets, target)
target.Handle(event, client)
event.targets = append(event.targets, target)
event.targetIds[target] = client.targteIds[target]
}
case *Query:
{
if target.user.Nick == nick {
target.Handle(event, client)
event.targets = append(event.targets, target)
event.targetIds[target] = client.targteIds[target]
}
}
case *Status:
{
if client.nick == event.Nick {
target.Handle(event, client)
event.targets = append(event.targets, target)
event.targetIds[target] = client.targteIds[target]
}
}
}
@@ -984,6 +1019,17 @@ func (client *Client) handleInTargets(nick string, event *Event) {
client.mutex.RUnlock()
}
func (client *Client) handleInTarget(target Target, event *Event) {
client.mutex.RLock()
target.Handle(event, client)
event.targets = append(event.targets, target)
event.targetIds[target] = client.targteIds[target]
client.mutex.RUnlock()
}
func generateClientID() string {
bytes := make([]byte, 12)
_, err := rand.Read(bytes)
event.go
+43 -10
View File
@@ -26,7 +26,10 @@ type Event struct {
killed bool
hidden bool
targets []Target
targets []Target
targetIds map[Target]string
RenderTags map[string]string
}
// NewEvent makes a new event with Kind, Verb, Time set and Args and Tags initialized.
@@ -39,6 +42,10 @@ func NewEvent(kind, verb string) Event {
Time: time.Now(),
Args: make([]string, 0, 4),
Tags: make(map[string]string),
targetIds: make(map[Target]string),
RenderTags: make(map[string]string),
}
}
@@ -120,13 +127,39 @@ func (event *Event) Arg(index int) string {
// MarshalJSON makes a JSON object from the event.
func (event *Event) MarshalJSON() ([]byte, error) {
return json.Marshal(map[string]interface{}{
"kind": event.kind,
"verb": event.verb,
"text": event.Text,
"args": event.Args,
"tags": event.Tags,
"killed": event.killed,
"hidden": event.hidden,
})
data := eventJSONData{
Name: event.Name(),
Kind: event.kind,
Verb: event.verb,
Time: event.Time,
Nick: event.Nick,
User: event.User,
Host: event.Host,
Args: event.Args,
Text: event.Text,
Tags: event.Tags,
RenderTags: event.RenderTags,
}
data.Targets = make([]string, 0, len(event.targets))
for _, target := range event.targets {
data.Targets = append(data.Targets, event.targetIds[target])
}
return json.Marshal(data)
}
type eventJSONData struct {
Name string `json:"name"`
Kind string `json:"kind"`
Verb string `json:"verb"`
Time time.Time `json:"time"`
Nick string `json:"nick"`
User string `json:"user"`
Host string `json:"host"`
Args []string `json:"args"`
Text string `json:"text"`
Tags map[string]string `json:"tags"`
Targets []string `json:"targets"`
RenderTags map[string]string `json:"renderTags"`
}