Merge remote-tracking branch 'torhve/master'
This commit is contained in:
commit
c41c33f9ab
|
@ -35,11 +35,31 @@ input#sendMessage {
|
|||
}
|
||||
|
||||
body {
|
||||
font-family: monospace;
|
||||
background-color: black;
|
||||
color: white;
|
||||
background-color: #222;
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
padding-bottom:70px;
|
||||
padding-top: 70px;
|
||||
}
|
||||
|
||||
input#sendMessage {
|
||||
border: 0;
|
||||
width: 100%;
|
||||
}
|
||||
.content {
|
||||
height: 100%;
|
||||
min-height: 100%;
|
||||
display: block;
|
||||
}
|
||||
.bufferlines {
|
||||
font-family: monospace;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.navbar-fixed-bottom {
|
||||
margin: 5px;
|
||||
}
|
||||
.color-light-green {
|
||||
color: chartreuse;
|
||||
}
|
||||
|
@ -48,6 +68,10 @@ body {
|
|||
color: deepskyblue;
|
||||
}
|
||||
|
||||
.danger {
|
||||
background-color: rgb(217, 83, 79);
|
||||
}
|
||||
|
||||
.color-28 {
|
||||
color: greenyellow;
|
||||
}
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
127
index.html
127
index.html
|
@ -1,8 +1,12 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html ng-app="weechat" ng-cloak>
|
||||
<head>
|
||||
<link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet" media="screen">
|
||||
<link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js" rel="stylesheet" media="screen">
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title ng-bind-template="WeeChat {{ pageTitle}}"></title>
|
||||
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet" media="screen">
|
||||
<link rel="shortcut icon" type="image/png" href="img/favicon.png" >
|
||||
<link href="css/glowingbear.css" rel="stylesheet" media="screen">
|
||||
<script type="text/javascript" src="js/angular.min.js"></script>
|
||||
<script type="text/javascript" src="js/underscore.js"></script>
|
||||
|
@ -11,52 +15,85 @@
|
|||
<script type="text/javascript" src="js/websockets.js"></script>
|
||||
<script type="text/javascript" src="js/models.js"></script>
|
||||
<script type="text/javascript" src="js/plugins.js"></script>
|
||||
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
|
||||
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
|
||||
</head>
|
||||
<body ng-app="weechat" ng-controller="WeechatCtrl">
|
||||
<div id="wrap">
|
||||
<div>
|
||||
<div ng-hide="connected" class="container">
|
||||
<form class="form-horizontal">
|
||||
<legend>Connection</legend>
|
||||
<body ng-controller="WeechatCtrl">
|
||||
<nav ng-show="connected" class="navbar navbar-default navbar-inverse navbar-fixed-top" role="navigation">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav ">
|
||||
<li class="label" ng-class="{'active': content.active }" ng-repeat="(key, content) in buffers | toArray | orderBy:'content.number':true">
|
||||
<a href="#" ng-click="setActiveBuffer(content.id)" title="{{ content.fullName }}">{{ content.shortName }}<span ng-hide="content.shortName">{{ content.fullName }}</span> <span class="badge" ng-class="{'danger': content.notification }" ng-bind="content.unread"></span></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<div ng-hide="connected" class="container">
|
||||
<h2>
|
||||
<img src="img/favicon.png">
|
||||
glowing bear
|
||||
<small>
|
||||
WeeChat web frontend
|
||||
</small>
|
||||
</h2>
|
||||
<div>To start using, please enable relay in your WeeChat client:
|
||||
<pre>
|
||||
/set relay.network.password yourpassword
|
||||
/relay add weechat 9001</pre>
|
||||
Note: The communication goes directly between your browser and your weechat in clear text.
|
||||
Connection settings are saved between sessions, including password, in your own browser.
|
||||
<h4>Encryption</h4>
|
||||
If you want to use encrypted session you first have to set up the relay using SSL
|
||||
<pre>
|
||||
$ mkdir -p ~/.weechat/ssl
|
||||
$ cd ~/.weechat/ssl
|
||||
$ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
|
||||
</pre>
|
||||
If WeeChat is already running, you can reload the certificate and private key with command:
|
||||
<pre>
|
||||
/relay sslcertkey
|
||||
/relay add ssl.weechat 8000
|
||||
</pre>
|
||||
</div>
|
||||
<h3>Connection settings</h3>
|
||||
<form role="form">
|
||||
<div class="alert alert-danger" ng-show="errorMessage">
|
||||
<strong>Oh no!</strong> We cannot connect!
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="hostport">Hostport</label>
|
||||
<div class="controls">
|
||||
<input type="text" id="hostport" ng-model="hostport" placeholder="Hostport">
|
||||
<div class="form-group">
|
||||
<label class="control-label" for="hostport">Hostname and port</label>
|
||||
<input type="text" class="form-control" id="hostport" ng-model="hostport" placeholder="Hostport">
|
||||
<p class="help-block">Enter the hostname and the port to the WeeChat relay, separated by a :</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label" for="password">WeeChat relay password</label>
|
||||
<input type="password" class="form-control" id="password" ng-model="password" placeholder="Password">
|
||||
<p class="help-block">Password will be stored in your browser session</p>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="proto">Proto</label>
|
||||
<div class="controls">
|
||||
<input type="text" id="proto" ng-model="proto" placeholder="proto">
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="password">Password</label>
|
||||
<div class="controls">
|
||||
<input type="password" id="password" ng-model="password" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<div class="controls">
|
||||
<button class="btn btn-primary" ng-click="connect()">Connect!</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label" for="proto">Encryption</label>
|
||||
<input type="checkbox" class="form-control" id="ssl" ng-model="ssl">
|
||||
<p class="help-block">Check the box if you want to encrypt communication between browser and WeeChat. <strong>Note</strong>: Due to a <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=594502">bug</a> encryption will not work in Firefox. You must also first visit the URL https://weechathost:relayport/ to accept the certificate</p>
|
||||
</div>
|
||||
<button class="btn btn-lg btn-primary" ng-click="connect()">Connect!</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div ng-show="connected">
|
||||
|
||||
<span class="label" ng-class="{'label-success': content.notification }" ng-repeat="(key, content) in buffers">
|
||||
<a ng-click="setActiveBuffer(key)">{{ content.fullName }}</a>
|
||||
<div class="content" ng-show="connected">
|
||||
<div class="bufferlines">
|
||||
<div class="bufferline" ng-repeat="bufferline in activeBuffer().lines">
|
||||
<span class="date text-muted">
|
||||
{{ bufferline.date | date:'HH:mm' }}
|
||||
</span>
|
||||
|
||||
|
||||
<div ng-repeat="bufferline in activeBuffer().lines">
|
||||
<span class="timestamp color-dark-gray">{{ bufferline.date | date: 'H:mm:ss'}}</span>
|
||||
<span ng-repeat="part in bufferline.content" class="text {{ part.fg }}">
|
||||
<span ng-repeat="part in bufferline.content" class="text" style="{{ part.fg }}">
|
||||
{{ part.text }}
|
||||
</span>
|
||||
|
||||
|
@ -71,16 +108,18 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div id="push"></div>
|
||||
</div>
|
||||
<div id="footer" ng-show="connected">
|
||||
<form ng-submit="sendMessage()">
|
||||
<input id="sendMessage" type="text" ng-model="command"></input>
|
||||
<div class="navbar navbar-inverse navbar-fixed-bottom">
|
||||
<form class="form form-horizontal" ng-submit="sendMessage()">
|
||||
<div class="input-group">
|
||||
<input id="sendMessage" type="text" class="form-control" ng-model="command">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default btn-primary">Send</button>
|
||||
</span>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</body>
|
||||
|
|
32
js/models.js
32
js/models.js
|
@ -11,10 +11,14 @@ models.service('models', ['colors', function(colors) {
|
|||
this.Buffer = function(message) {
|
||||
// weechat properties
|
||||
var fullName = message['full_name']
|
||||
var shortName = message['short_name']
|
||||
var title = message['title']
|
||||
var number = message['number']
|
||||
var pointer = message['pointers'][0]
|
||||
var lines = []
|
||||
var active = false;
|
||||
var notification = false;
|
||||
var unread = '';
|
||||
|
||||
/*
|
||||
* Adds a line to this buffer
|
||||
|
@ -29,6 +33,9 @@ models.service('models', ['colors', function(colors) {
|
|||
return {
|
||||
id: pointer,
|
||||
fullName: fullName,
|
||||
shortName: shortName,
|
||||
number: number,
|
||||
title: title,
|
||||
lines: lines,
|
||||
addLine: addLine
|
||||
}
|
||||
|
@ -38,7 +45,7 @@ models.service('models', ['colors', function(colors) {
|
|||
/*
|
||||
* BufferLine class
|
||||
*/
|
||||
this.BufferLine = function(weechatBufferLine) {
|
||||
this.BufferLine = function(message) {
|
||||
|
||||
/*
|
||||
* Parse the text elements from the buffer line added
|
||||
|
@ -46,9 +53,9 @@ models.service('models', ['colors', function(colors) {
|
|||
* @param message weechat message
|
||||
*/
|
||||
function parseLineAddedTextElements(message) {
|
||||
var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']);
|
||||
var prefix = colors.parse(message['prefix']);
|
||||
|
||||
var buffer = message['objects'][0]['content'][0]['buffer'];
|
||||
var buffer = message['buffer'];
|
||||
text_elements = _.union(prefix, text);
|
||||
text_elements =_.map(text_elements, function(text_element) {
|
||||
if (text_element && ('fg' in text_element)) {
|
||||
|
@ -62,16 +69,26 @@ models.service('models', ['colors', function(colors) {
|
|||
}
|
||||
|
||||
|
||||
var buffer = message['objects'][0]['content'][0]['buffer'];
|
||||
var date = message['objects'][0]['content'][0]['date'];
|
||||
var text = colors.parse(message['objects'][0]['content'][0]['message']);
|
||||
var buffer = message['buffer'];
|
||||
var date = message['date'];
|
||||
var text = colors.parse(message['message']);
|
||||
var tags_array = message['tags_array'];
|
||||
var displayed = message['displayed'];
|
||||
var highlight = message['highlight'];
|
||||
var content = parseLineAddedTextElements(message);
|
||||
var rtext = "";
|
||||
if(text[0] != undefined) {
|
||||
rtext = text[0]['text'];
|
||||
}
|
||||
|
||||
return {
|
||||
content: content,
|
||||
date: date,
|
||||
buffer: buffer,
|
||||
text: text[0]['text'],
|
||||
tags: tags_array,
|
||||
highlight: highlight,
|
||||
displayed: displayed,
|
||||
text: rtext,
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -125,6 +142,7 @@ models.service('models', ['colors', function(colors) {
|
|||
});
|
||||
activeBuffer.notification = false;
|
||||
activeBuffer.active = true;
|
||||
activeBuffer.unread = '';
|
||||
|
||||
}
|
||||
|
||||
|
|
248
js/websockets.js
248
js/websockets.js
|
@ -1,9 +1,78 @@
|
|||
var weechat = angular.module('weechat', ['localStorage', 'weechatModels', 'plugins']);
|
||||
|
||||
weechat.filter('toArray', function () {
|
||||
'use strict';
|
||||
|
||||
return function (obj) {
|
||||
if (!(obj instanceof Object)) {
|
||||
return obj;
|
||||
}
|
||||
|
||||
return Object.keys(obj).map(function (key) {
|
||||
return Object.defineProperty(obj[key], '$key', {__proto__: null, value: key});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
weechat.factory('colors', [function($scope) {
|
||||
|
||||
// http://weechat.org/files/doc/devel/weechat_dev.en.html#color_codes_in_strings
|
||||
var part, fg, bg, attrs, colors = ['', 'black', 'dark gray', 'dark red', 'light red', 'dark green', 'light green', 'brown', 'yellow', 'dark blue', 'light blue', 'dark magenta', 'light magenta', 'dark cyan', 'light cyan', 'gray', 'white'];
|
||||
// XTerm 8-bit pallete
|
||||
var colors = [
|
||||
'#000000', '#AA0000', '#00AA00', '#AA5500', '#0000AA',
|
||||
'#AA00AA', '#00AAAA', '#AAAAAA', '#555555', '#FF5555',
|
||||
'#55FF55', '#FFFF55', '#5555FF', '#FF55FF', '#55FFFF',
|
||||
'#FFFFFF', '#000000', '#00005F', '#000087', '#0000AF',
|
||||
'#0000D7', '#0000FF', '#005F00', '#005F5F', '#005F87',
|
||||
'#005FAF', '#005FD7', '#005FFF', '#008700', '#00875F',
|
||||
'#008787', '#0087AF', '#0087D7', '#00AF00', '#00AF5F',
|
||||
'#00AF87', '#00AFAF', '#00AFD7', '#00AFFF', '#00D700',
|
||||
'#00D75F', '#00D787', '#00D7AF', '#00D7D7', '#00D7FF',
|
||||
'#00FF00', '#00FF5F', '#00FF87', '#00FFAF', '#00FFD7',
|
||||
'#00FFFF', '#5F0000', '#5F005F', '#5F0087', '#5F00AF',
|
||||
'#5F00D7', '#5F00FF', '#5F5F00', '#5F5F5F', '#5F5F87',
|
||||
'#5F5FAF', '#5F5FD7', '#5F5FFF', '#5F8700', '#5F875F',
|
||||
'#5F8787', '#5F87AF', '#5F87D7', '#5F87FF', '#5FAF00',
|
||||
'#5FAF5F', '#5FAF87', '#5FAFAF', '#5FAFD7', '#5FAFFF',
|
||||
'#5FD700', '#5FD75F', '#5FD787', '#5FD7AF', '#5FD7D7',
|
||||
'#5FD7FF', '#5FFF00', '#5FFF5F', '#5FFF87', '#5FFFAF',
|
||||
'#5FFFD7', '#5FFFFF', '#870000', '#87005F', '#870087',
|
||||
'#8700AF', '#8700D7', '#8700FF', '#875F00', '#875F5F',
|
||||
'#875F87', '#875FAF', '#875FD7', '#875FFF', '#878700',
|
||||
'#87875F', '#878787', '#8787AF', '#8787D7', '#8787FF',
|
||||
'#87AF00', '#87AF5F', '#87AF87', '#87AFAF', '#87AFD7',
|
||||
'#87AFFF', '#87D700', '#87D75F', '#87D787', '#87D7AF',
|
||||
'#87D7D7', '#87D7FF', '#87FF00', '#87FF5F', '#87FF87',
|
||||
'#87FFAF', '#87FFD7', '#87FFFF', '#AF0000', '#AF005F',
|
||||
'#AF0087', '#AF00AF', '#AF00D7', '#AF00FF', '#AF5F00',
|
||||
'#AF5F5F', '#AF5F87', '#AF5FAF', '#AF5FD7', '#AF5FFF',
|
||||
'#AF8700', '#AF875F', '#AF8787', '#AF87AF', '#AF87D7',
|
||||
'#AF87FF', '#AFAF00', '#AFAF5F', '#AFAF87', '#AFAFAF',
|
||||
'#AFAFD7', '#AFAFFF', '#AFD700', '#AFD75F', '#AFD787',
|
||||
'#AFD7AF', '#AFD7D7', '#AFD7FF', '#AFFF00', '#AFFF5F',
|
||||
'#AFFF87', '#AFFFAF', '#AFFFD7', '#AFFFFF', '#D70000',
|
||||
'#D7005F', '#D70087', '#D700AF', '#D700D7', '#D700FF',
|
||||
'#D75F00', '#D75F5F', '#D75F87', '#D75FAF', '#D75FD7',
|
||||
'#D75FFF', '#D78700', '#D7875F', '#D78787', '#D787AF',
|
||||
'#D787D7', '#D787FF', '#D7AF00', '#D7AF5F', '#D7AF87',
|
||||
'#D7AFAF', '#D7AFD7', '#D7AFFF', '#D7D700', '#D7D75F',
|
||||
'#D7D787', '#D7D7AF', '#D7D7D7', '#D7D7FF', '#D7FF00',
|
||||
'#D7FF5F', '#D7FF87', '#D7FFAF', '#D7FFD7', '#D7FFFF',
|
||||
'#FF0000', '#FF005F', '#FF0087', '#FF00AF', '#FF00D7',
|
||||
'#FF00FF', '#FF5F00', '#FF5F5F', '#FF5F87', '#FF5FAF',
|
||||
'#FF5FD7', '#FF5FFF', '#FF8700', '#FF875F', '#FF8787',
|
||||
'#FF87AF', '#FF87D7', '#FF87FF', '#FFAF00', '#FFAF5F',
|
||||
'#FFAF87', '#FFAFAF', '#FFAFD7', '#FFAFFF', '#FFD700',
|
||||
'#FFD75F', '#FFD787', '#FFD7AF', '#FFD7D7', '#FFD7FF',
|
||||
'#FFFF00', '#FFFF5F', '#FFFF87', '#FFFFAF', '#FFFFD7',
|
||||
'#FFFFFF', '#080808', '#121212', '#1C1C1C', '#262626',
|
||||
'#303030', '#3A3A3A', '#444444', '#4E4E4E', '#585858',
|
||||
'#626262', '#6C6C6C', '#767676', '#808080', '#8A8A8A',
|
||||
'#949494', '#9E9E9E', '#A8A8A8', '#B2B2B2', '#BCBCBC',
|
||||
'#C6C6C6', '#D0D0D0', '#DADADA', '#E4E4E4', '#EEEEEE'
|
||||
]
|
||||
|
||||
|
||||
function setAttrs() {
|
||||
while (part.match(/^[\*\/\_\|]/)) {
|
||||
|
@ -15,8 +84,8 @@ weechat.factory('colors', [function($scope) {
|
|||
function getColor() {
|
||||
var c;
|
||||
if (part.match(/^@/)) {
|
||||
c = part.slice(1, 5);
|
||||
part = part.slice(5);
|
||||
c = part.slice(1, 6);
|
||||
part = part.slice(6);
|
||||
} else {
|
||||
c = part.slice(0, 2);
|
||||
part = part.slice(2);
|
||||
|
@ -26,9 +95,9 @@ weechat.factory('colors', [function($scope) {
|
|||
|
||||
function prepareCss(color) {
|
||||
/*
|
||||
* Translates a weechat color string to CSS
|
||||
* Translates a weechat color to CSS
|
||||
*/
|
||||
return'color-' + color.replace(' ', '-');
|
||||
return 'color: ' + color;
|
||||
}
|
||||
|
||||
var prefixes = {
|
||||
|
@ -109,7 +178,6 @@ weechat.factory('colors', [function($scope) {
|
|||
|
||||
}]);
|
||||
|
||||
|
||||
weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', function($rootScope, colors, models, plugins) {
|
||||
|
||||
var handleBufferClosing = function(message) {
|
||||
|
@ -118,27 +186,64 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi
|
|||
models.closeBuffer(buffer);
|
||||
}
|
||||
|
||||
var handleBufferLineAdded = function(message) {
|
||||
var buffer_line = {}
|
||||
var handleLine = function(line, initial) {
|
||||
var message = new models.BufferLine(line);
|
||||
// Only react to line if its displayed
|
||||
if(message.displayed) {
|
||||
var buffer = models.getBuffer(message.buffer);
|
||||
message.metadata = plugins.PluginManager.contentForMessage(message.text);
|
||||
buffer.addLine(message);
|
||||
|
||||
if (buffer.active) {
|
||||
$rootScope.scrollToBottom();
|
||||
}
|
||||
|
||||
var message = new models.BufferLine(message);
|
||||
var buffer = models.getBuffer(message.buffer);
|
||||
message.metadata = plugins.PluginManager.contentForMessage(message.text);
|
||||
buffer.addLine(message);
|
||||
if (!initial) {
|
||||
if (!buffer.active && _.contains(message.tags, 'notify_message') && !_.contains(message.tags, 'notify_none')) {
|
||||
if (buffer.unread == '' || buffer.unread == undefined) {
|
||||
buffer.unread = 1;
|
||||
}else {
|
||||
buffer.unread++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!buffer.active) {
|
||||
buffer.notification = true;
|
||||
if(message.highlight || _.contains(message.tags, 'notify_private') ) {
|
||||
$rootScope.createHighlight(buffer, message);
|
||||
buffer.notification = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var handleBufferLineAdded = function(message) {
|
||||
message['objects'][0]['content'].forEach(function(l) {
|
||||
handleLine(l, false);
|
||||
});
|
||||
}
|
||||
|
||||
var handleBufferOpened = function(message) {
|
||||
var bufferMessage = message['objects'][0]['content'][0];
|
||||
var buffer = new models.Buffer(bufferMessage);
|
||||
models.addBuffer(buffer);
|
||||
|
||||
}
|
||||
|
||||
var handleBufferTitleChanged = function(message) {
|
||||
var obj = message['objects'][0]['content'][0];
|
||||
var buffer = obj['pointers'][0];
|
||||
var old = models.getBuffer(buffer);
|
||||
old.fullName = obj['full_name'];
|
||||
old.title = obj['title'];
|
||||
old.number = obj['number'];
|
||||
}
|
||||
var handleBufferRenamed = function(message) {
|
||||
var obj = message['objects'][0]['content'][0];
|
||||
var buffer = obj['pointers'][0];
|
||||
var old = models.getBuffer(buffer);
|
||||
old.fullName = obj['full_name'];
|
||||
old.shortName = obj['short_name'];
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Handle answers to (bufinfo) messages
|
||||
*
|
||||
|
@ -154,6 +259,21 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi
|
|||
models.addBuffer(buffer);
|
||||
}
|
||||
|
||||
// Request latest buffer lines for each buffer
|
||||
$rootScope.getLines();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Handle answers to (lineinfo) messages
|
||||
*
|
||||
* (lineinfo) messages are specified by this client. It is request after bufinfo completes
|
||||
*/
|
||||
var handleLineInfo = function(message) {
|
||||
var lines = message['objects'][0]['content'].reverse();
|
||||
lines.forEach(function(l) {
|
||||
handleLine(l, true);
|
||||
});
|
||||
}
|
||||
|
||||
var handleEvent = function(event) {
|
||||
|
@ -163,20 +283,14 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi
|
|||
|
||||
}
|
||||
|
||||
var findMetaData = function(message) {
|
||||
if (message.indexOf('youtube.com') != -1) {
|
||||
var index = message.indexOf("?v=");
|
||||
var token = message.substr(index+3);
|
||||
return '<iframe width="560" height="315" src="http://www.youtube.com/embed/' + token + '" frameborder="0" allowfullscreen></iframe>'
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
var eventHandlers = {
|
||||
bufinfo: handleBufferInfo,
|
||||
lineinfo: handleLineInfo,
|
||||
_buffer_closing: handleBufferClosing,
|
||||
_buffer_line_added: handleBufferLineAdded,
|
||||
_buffer_opened: handleBufferOpened
|
||||
_buffer_opened: handleBufferOpened,
|
||||
_buffer_title_changed: handleBufferTitleChanged,
|
||||
_buffer_renamed: handleBufferRenamed
|
||||
}
|
||||
|
||||
return {
|
||||
|
@ -202,13 +316,12 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', 'mode
|
|||
}
|
||||
|
||||
// Takes care of the connection and websocket hooks
|
||||
var connect = function (hostport, proto, passwd) {
|
||||
websocket = new WebSocket("ws://" + hostport + "/weechat");
|
||||
var connect = function (hostport, passwd, ssl) {
|
||||
var proto = ssl ? 'wss':'ws';
|
||||
websocket = new WebSocket(proto+"://" + hostport + "/weechat");
|
||||
websocket.binaryType = "arraybuffer"
|
||||
|
||||
websocket.onopen = function (evt) {
|
||||
// FIXME: does password need to be sent only if protocol is not weechat?
|
||||
if (proto == "weechat") {
|
||||
doSend(WeeChatProtocol.formatInit({
|
||||
password: passwd,
|
||||
compression: 'off'
|
||||
|
@ -216,12 +329,10 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', 'mode
|
|||
doSend(WeeChatProtocol.formatHdata({
|
||||
id: 'bufinfo',
|
||||
path: 'buffer:gui_buffers(*)',
|
||||
keys: ['full_name']
|
||||
}));
|
||||
doSend(WeeChatProtocol.formatSync({}));
|
||||
} else {
|
||||
keys: ['number,full_name,short_name,title']
|
||||
}));
|
||||
doSend(WeeChatProtocol.formatSync({}));
|
||||
|
||||
}
|
||||
$log.info("Connected to relay");
|
||||
$rootScope.connected = true;
|
||||
$rootScope.$apply();
|
||||
|
@ -241,7 +352,7 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', 'mode
|
|||
}
|
||||
|
||||
websocket.onerror = function (evt) {
|
||||
if (evt.type == "error" && websocket.readyState == 0) {
|
||||
if (evt.type == "error" && websocket.readyState != 1) {
|
||||
$rootScope.errorMessage = true;
|
||||
}
|
||||
$log.error("Relay error " + evt.data);
|
||||
|
@ -257,7 +368,17 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', 'mode
|
|||
}));
|
||||
}
|
||||
|
||||
var getLines = function(count) {
|
||||
doSend(WeeChatProtocol.formatHdata({
|
||||
id: 'lineinfo',
|
||||
path: "buffer:gui_buffers(*)/own_lines/last_line(-"+count+")/data",
|
||||
keys: []
|
||||
}));
|
||||
}
|
||||
|
||||
return {
|
||||
send: doSend,
|
||||
getLines: getLines,
|
||||
connect: connect,
|
||||
sendMessage: sendMessage
|
||||
}
|
||||
|
@ -265,6 +386,21 @@ weechat.factory('connection', ['$rootScope', '$log', 'handlers', 'colors', 'mode
|
|||
|
||||
weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', 'models', 'connection', function ($rootScope, $scope, $store, models, connection, testService) {
|
||||
|
||||
// Request notification permission
|
||||
Notification.requestPermission(function (status) {
|
||||
console.log('Notification permission status:',status);
|
||||
if (Notification.permission !== status) {
|
||||
Notification.permission = status;
|
||||
}
|
||||
});
|
||||
if(window.webkitNotifications != undefined) {
|
||||
if (window.webkitNotifications.checkPermission() == 0) { // 0 is PERMISSION_ALLOWED
|
||||
console.log('Notification permission status:', window.webkitNotifications.checkPermission() == 0);
|
||||
window.webkitNotifications.requestPermission();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$scope.buffers = models.model.buffers;
|
||||
$scope.activeBuffer = models.getActiveBuffer
|
||||
|
||||
|
@ -280,8 +416,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', 'models', '
|
|||
|
||||
$rootScope.commands = []
|
||||
|
||||
|
||||
|
||||
$rootScope.models = models;
|
||||
|
||||
$rootScope.buffer = []
|
||||
|
@ -289,21 +423,61 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', 'models', '
|
|||
$store.bind($scope, "hostport", "localhost:9001");
|
||||
$store.bind($scope, "proto", "weechat");
|
||||
$store.bind($scope, "password", "");
|
||||
$store.bind($scope, "ssl", false);
|
||||
// TODO checkbox for saving password or not?
|
||||
// $scope.password = "";
|
||||
|
||||
|
||||
$scope.setActiveBuffer = function(key) {
|
||||
models.setActiveBuffer(key);
|
||||
var ab = models.getActiveBuffer();
|
||||
$rootScope.pageTitle = ab.shortName + ' | ' + ab.title;
|
||||
$rootScope.scrollToBottom();
|
||||
};
|
||||
|
||||
$rootScope.$watch('activeBuffer', function(newVal, oldVal) {
|
||||
if (newVal && newVal !== oldVal) {
|
||||
$rootScope.scrollToBottom();
|
||||
}
|
||||
});
|
||||
|
||||
$rootScope.scrollToBottom = function() {
|
||||
setTimeout(function() {
|
||||
window.scrollTo(0, window.scrollMaxY);
|
||||
});
|
||||
}
|
||||
|
||||
$scope.sendMessage = function() {
|
||||
connection.sendMessage($scope.command);
|
||||
$scope.command = "";
|
||||
};
|
||||
|
||||
$scope.connect = function() {
|
||||
connection.connect($scope.hostport, $scope.proto, $scope.password);
|
||||
connection.connect($scope.hostport, $scope.password, $scope.ssl);
|
||||
}
|
||||
$rootScope.getLines = function() {
|
||||
var count = 20;
|
||||
connection.getLines(count);
|
||||
}
|
||||
|
||||
/* Function gets called from bufferLineAdded code if user should be notified */
|
||||
$rootScope.createHighlight = function(buffer, message) {
|
||||
var messages = "";
|
||||
message.content.forEach(function(part) {
|
||||
if (part.text != undefined)
|
||||
messages += part.text + " ";
|
||||
});
|
||||
|
||||
var title = buffer.fullName;
|
||||
var content = messages;
|
||||
|
||||
var timeout = 15*1000;
|
||||
console.log('Displaying notification:buffer:',buffer,',message:',message,',with timeout:',timeout);
|
||||
var notification = new Notification(title, {body:content, icon:'img/favicon.png'});
|
||||
// Cancel notification automatically
|
||||
notification.onshow = function() {
|
||||
setTimeout(function() { notification.close() }, timeout);
|
||||
}
|
||||
};
|
||||
}]
|
||||
);
|
||||
|
|
|
@ -489,7 +489,7 @@ WeeChatProtocol.prototype = {
|
|||
* @return Character (string)
|
||||
*/
|
||||
_getChar: function() {
|
||||
return String.fromCharCode(this._getByte());
|
||||
return this._getByte();
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue